Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1d7152d07c44d1a74a53cb4989f90df3f80b2c89)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1d7152d07c44d1a74a53cb4989f90df3f80b2c89)
  • Date: Fri, 28 Mar 2008 04:25:48 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 6 ++++++
var/lib/sorcery/modules/build_api/api2 | 19 +++++++++++++++++--
var/lib/sorcery/modules/libmedia | 12 ++++++------
3 files changed, 29 insertions(+), 8 deletions(-)

New commits:
commit 1d7152d07c44d1a74a53cb4989f90df3f80b2c89
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

api2: added some more messages to cast stages, initial patch from Sergey
Lipnevich #8521

commit 72d7e46960167fd193975a4b940e2266717fff87
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libmedia: reset the color in the CHECK_ and MESSAGE_COLOR definitions, so
they can't inherit the bold atribute from the other colors

diff --git a/ChangeLog b/ChangeLog
index 5e4e431..e9cf2d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libmedia: reset the color in the CHECK_ and MESSAGE_COLOR
definitions, so
+ they can't inherit the bold atribute from the other colors
+ * api2: added some more messages to cast stages, initial patch from
Sergey
+ Lipnevich #8521
+
2008-03-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* changed uses of plain sort|uniq to the featurewise equivalent sort
-u
and then the same for uses of plain sort file|uniq
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index d1ca054..1c83680 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -120,7 +120,7 @@ function run_build_spell() {
function run_pre_build() {

debug "build_api/api2" "run_pre_build()"
- message "${MESSAGE_COLOR}Building" \
+ message "${MESSAGE_COLOR}Preparing" \
"${SPELL_COLOR}${SPELL}" \
"${DEFAULT_COLOR}"

@@ -144,6 +144,9 @@ function run_build() {

echo "Compile log for $SPELL $VERSION Built on `date -u`" > $C_LOG
echo "Using gcc version: `gcc -dumpversion`" >> $C_LOG
+ message "${MESSAGE_COLOR}Building" \
+ "${SPELL_COLOR}${SPELL}" \
+ "${DEFAULT_COLOR}"

if [ -d "$SOURCE_DIRECTORY" ] ; then
cd "$SOURCE_DIRECTORY"
@@ -201,6 +204,18 @@ function run_pre_install() {
#---------------------------------------------------------------------
function run_install() {
debug "build_api/api2" "Starting run_install()"
+
+ if [[ $STAGED_INSTALL == on ]]; then
+ message "${MESSAGE_COLOR}Installing" \
+ "${SPELL_COLOR}${SPELL}" \
+ "${MESSAGE_COLOR}into the stage" \
+ "${DEFAULT_COLOR}"
+ else
+ message "${MESSAGE_COLOR}Installing" \
+ "${SPELL_COLOR}${SPELL}" \
+ "${DEFAULT_COLOR}"
+ fi
+
if [ -f $S_PWD ] ; then
cd "`cat $S_PWD`"
elif [ -d $SOURCE_DIRECTORY ] ; then
@@ -213,7 +228,7 @@ function run_install() {

if [ "$?" != 0 ]; then
message "${PROBLEM_COLOR}" \
- "! Problem Detected !" \
+ "Problem Detected!" \
"${DEFAULT_COLOR}"
false
fi
diff --git a/var/lib/sorcery/modules/libmedia
b/var/lib/sorcery/modules/libmedia
index e454419..2c34ef8 100755
--- a/var/lib/sorcery/modules/libmedia
+++ b/var/lib/sorcery/modules/libmedia
@@ -43,12 +43,12 @@ function media_init() {
VERSION_COLOR="${BLACK}${BOLD}"
QUERY_COLOR="${BLUE}${BOLD}"
DISPEL_COLOR="${BLUE}${BOLD}"
- CHECK_COLOR="${CYAN}"
+ CHECK_COLOR="${DEFAULT_COLOR}${CYAN}"
RESURRECT_COLOR="${GREEN}${BOLD}"
FILE_COLOR="${GREEN}${BOLD}"
SYMLINK_COLOR="${CYAN}${BOLD}"
PROBLEM_COLOR="${RED}${BOLD}"
- MESSAGE_COLOR="${CYAN}"
+ MESSAGE_COLOR="${DEFAULT_COLOR}${CYAN}"
;;

Xblueish)
@@ -56,12 +56,12 @@ function media_init() {
VERSION_COLOR="${BLACK}${BOLD}"
QUERY_COLOR="${BLUE}${BOLD}"
DISPEL_COLOR="${BLUE}${BOLD}"
- CHECK_COLOR="${CYAN}"
+ CHECK_COLOR="${DEFAULT_COLOR}${CYAN}"
RESURRECT_COLOR="${VIOLET}"
FILE_COLOR="${VIOLET}${BOLD}"
SYMLINK_COLOR="${CYAN}${BOLD}"
PROBLEM_COLOR="${RED}${BOLD}"
- MESSAGE_COLOR="${CYAN}"
+ MESSAGE_COLOR="${DEFAULT_COLOR}${CYAN}"
;;

X*)
@@ -69,12 +69,12 @@ function media_init() {
VERSION_COLOR="${WHITE}${BOLD}\e[40m"
QUERY_COLOR="${YELLOW}${BOLD}"
DISPEL_COLOR="${YELLOW}${BOLD}"
- CHECK_COLOR="${CYAN}"
+ CHECK_COLOR="${DEFAULT_COLOR}${CYAN}"
RESURRECT_COLOR="${GREEN}${BOLD}"
FILE_COLOR="${GREEN}${BOLD}"
SYMLINK_COLOR="${CYAN}${BOLD}"
PROBLEM_COLOR="${RED}${BOLD}"
- MESSAGE_COLOR="${CYAN}"
+ MESSAGE_COLOR="${DEFAULT_COLOR}${CYAN}"
;;
esac
}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1d7152d07c44d1a74a53cb4989f90df3f80b2c89), Jaka Kranjc, 03/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page