Skip to Content.
Sympa Menu

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

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 (8711bb60fc5c29235bee8bb5cfe14a0308e4c135)
  • Date: Thu, 30 Dec 2010 04:51:26 -0600

GIT changes to master 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 8711bb60fc5c29235bee8bb5cfe14a0308e4c135
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtrack, common: newer installwatch has a different log variable #13873

diff --git a/ChangeLog b/ChangeLog
index 6684d19..6be83fa 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-09-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libinitd: fixed bad regexes, grep 2.7 does not tolerate them #15852

diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 9c834d7..57edb2b 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -397,7 +397,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 7971b7b..8fba3be 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -130,7 +130,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 16559fd..3b83465 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1294,7 +1294,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
real_list_find "$vars" "$1"
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 4c43f51..ed0a462 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -41,7 +41,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
@@ -157,6 +157,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
}
@@ -168,7 +169,7 @@ function real_invoke_installwatch() {
#---------------------------------------------------------------------
function real_devoke_installwatch() {
unset LD_PRELOAD
- unset INSTALLWATCHFILE
+ unset INSTALLWATCHFILE INSTW_LOGFILE
}

function is_castfs_installed()
@@ -201,7 +202,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'



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (8711bb60fc5c29235bee8bb5cfe14a0308e4c135), Jaka Kranjc, 12/30/2010

Archive powered by MHonArc 2.6.24.

Top of Page