[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (4d7fd5827a997f12616cddc1d158af541109e3a6)

Jaka Kranjc scm at sourcemage.org
Sat Apr 19 11:34:06 EDT 2008


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

 ChangeLog        |    4 ++++
 usr/sbin/sorcery |    9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 4d7fd5827a997f12616cddc1d158af541109e3a6
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    fixed CCACHE and STORE_CONF_LOG not being disablable

commit b7773d3b233cb4563cef6d7237e93a1e37bb0bac
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    sorcery: sanitized the saving of CCACHE in the feature_menu

diff --git a/ChangeLog b/ChangeLog
index 6b74e99..c2fb4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* sorcery: sanitized the saving of CCACHE in the feature_menu
+	  fixed CCACHE and STORE_CONF_LOG not being disablable
+
 2008-04-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libsorcery: don't clear the line on every queuing progress bar update
 
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index acbbe8e..2f42e92 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1594,7 +1594,7 @@ PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:-off}
       "SCREEN"         "Toggle"  "$SCREEN"         "$SCR_HELP" \
       "PER_SPELL_CFLAGS" "Toggle" "$PER_SPELL_CFLAGS" "$PSC_HELP"'`
   then
-    TEMP=(ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE COLOR GATHER_DOCS MAIL_REPORTS VIEW_REPORTS PRESERVE SUSTAIN TMPFS VOYEUR REAP NET_SELECT CONFIG_LOC CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN PER_SPELL_CFLAGS)
+    TEMP=(ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE CCACHE COLOR CONFIG_LOC GATHER_DOCS MAIL_REPORTS PRESERVE SUSTAIN TMPFS VIEW_REPORTS VOYEUR REAP STORE_CONF_LOG NET_SELECT CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN PER_SPELL_CFLAGS)
     for i in ${TEMP[*]} ; do
       eval $i=off
     done
@@ -1635,12 +1635,7 @@ PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:-off}
     done
 
     modify_local_config "color" "$COLOR" "command"
-
-    TEMP=`cat       $LOCAL_COMPILE_CONFIG  |
-          grep  -v  "CCACHE="`
-
-    echo  "$TEMP"           >   $LOCAL_COMPILE_CONFIG
-    echo  "CCACHE=$CCACHE"  >>  $LOCAL_COMPILE_CONFIG
+    modify_config $LOCAL_COMPILE_CONFIG CCACHE $CCACHE
   fi
 
 }



More information about the SM-Commit mailing list