[SM-Commit] GIT changes to stable-1.14 sorcery by Jaka Kranjc (f473b8a9b9174e2f57de283ec45db6bb0a73c5e8)

Jaka Kranjc scm at sourcemage.org
Thu Dec 30 12:04:10 EST 2010


GIT changes to stable-1.14 sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog                                |    3 +++
 var/lib/sorcery/modules/build_api/common |    2 +-
 var/lib/sorcery/modules/libapi           |    2 +-
 var/lib/sorcery/modules/libmisc          |    2 +-
 var/lib/sorcery/modules/libtrack         |    7 ++++---
 5 files changed, 10 insertions(+), 6 deletions(-)

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

    libtrack, common: newer installwatch has a different log variable #13873
    
    (cherry-picked from commit 8711bb60fc5c29235bee8bb5cfe14a0308e4c135)

diff --git a/ChangeLog b/ChangeLog
index cd90079..33609ba 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-12-30 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libtrack, common: newer installwatch has a different log variable #13873
+
 2010-10-19 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* version: 1.14.5 released
 
diff --git a/var/lib/sorcery/modules/build_api/common b/var/lib/sorcery/modules/build_api/common
index 1fab067..a064107 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -409,7 +409,7 @@ function run_spell_failure() {
     # This may have been locked if there was a failure during the install
     unlock_resources "libgrimoire" "install"
 
-    IW_LOG="$INSTALLWATCHFILE"
+    IW_LOG="${INSTALLWATCHFILE:-$INSTW_LOGFILE}"
     devoke_installwatch
 
     rm -f $IW_LOG $C_LOG
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index d5a4465..ea24ff7 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -129,7 +129,7 @@
 # CAST_HASH BACK_CAST_HASH CANNOT_CAST_HASH uncommitted_hash NEW_DEPENDS
 # spell_depends DEPENDS_CONFIG UP_DEPENDS SPELL_CONFIG GRIMOIRE_DIR
 # BUILD_API VOYEUR_STDOUT VOYEUR_STDERR C_LOG C_FIFO INST_LOG MD5_LOG
-# INSTALLWATCHFILE CAST_EXIT_STATUS
+# INSTALLWATCHFILE INSTW_LOGFILE CAST_EXIT_STATUS
 #
 #---------------------------------------------------------------------
 
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 8e4889f..51294b9 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1257,7 +1257,7 @@ function is_sorcery_var() {
   spell_depends DEPENDS_CONFIG UP_DEPENDS SPELL_CONFIG GRIMOIRE_DIR \
   SCRIPT_DIRECTORY SECTION_DIRECTORY GRIMOIRE SPELL_DIRECTORY SECTION \
   BUILD_API VOYEUR_STDOUT VOYEUR_STDERR C_LOG C_FIFO INSTALL_ROOT HOST \
-  BUILD INST_LOG MD5_LOG INSTALLWATCHFILE CAST_EXIT_STATUS"
+  BUILD INST_LOG MD5_LOG INSTALLWATCHFILE INSTW_LOGFILE CAST_EXIT_STATUS"
 
   # the \\< \\> matches word boundaries
   echo $vars|grep -q "\\<$1\\>"
diff --git a/var/lib/sorcery/modules/libtrack b/var/lib/sorcery/modules/libtrack
index 951c14a..59b12eb 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -38,7 +38,7 @@ function exists()  {
 #---------------------------------------------------------------------
 function real_track_manual()  {
   if  [[ -z "$STAGED_INSTALL" || $STAGED_INSTALL == off ]] &&
-      [[ -z "$INSTALLWATCHFILE"  ]] ;  then
+      [[ -z "$INSTALLWATCHFILE" && -z "$INSTW_LOGFILE" ]] ;  then
     echo "Can't tell installwatch to manually track... installwatch isn't running."
     return 1
   fi
@@ -154,6 +154,7 @@ function destroy_stage_root()
 function real_invoke_installwatch()  {
   if [[ -e $INSTALLWATCH_SO ]]; then
     export  INSTALLWATCHFILE=$IW_LOG
+    export  INSTW_LOGFILE=$IW_LOG
     export  LD_PRELOAD=$INSTALLWATCH_SO
   fi
 }
@@ -165,7 +166,7 @@ function real_invoke_installwatch()  {
 #---------------------------------------------------------------------
 function real_devoke_installwatch()  {
   unset  LD_PRELOAD
-  unset  INSTALLWATCHFILE
+  unset  INSTALLWATCHFILE INSTW_LOGFILE
 }
 
 function is_castfs_installed()
@@ -198,7 +199,7 @@ function parse_iw()  {
   # tab character and not some number of spaces. Otherwise BAD THINGS
   # will happen.
   local TAB=$'\t'
-  OMIT_IN="${TAB}rename\|${TAB}symlink\|${TAB}unlink"
+  OMIT_IN="${TAB}rename\|${TAB}symlink\|${TAB}unlink\|${TAB}access\|${TAB}utimes"
 
   grep -v "$OMIT_IN" $INPUT | cut -f3 | grep "^/" | sed 's#^//#/#g'
   cat                $INPUT | cut -f4 | grep "^/" | sed 's#^//#/#g'



More information about the SM-Commit mailing list