Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

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

 ChangeLog                                   |   23 +++++++++++++++++++++++
 etc/sorcery/config                          |    3 ++-
 etc/sorcery/version                         |    2 +-
 var/lib/sorcery/modules/dl_handlers/dl_wget |    2 +-
 var/lib/sorcery/modules/libcast             |    2 +-
 var/lib/sorcery/modules/libdepends          |    2 +-
 var/lib/sorcery/modules/libmisc             |   20 ++++++++++----------
 var/lib/sorcery/modules/libtrack            |    5 +----
 var/lib/sorcery/modules/libtriggers         |   14 +++++++++++++-
 var/lib/sorcery/sustained                   |    1 -
 10 files changed, 53 insertions(+), 21 deletions(-)

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

    1.14.4-rc3

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

    sustained: removed texinfo #15374

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

    dl_wget, dl_aria2: rename the download to the expected name #15097
    
    (cherry-picked from commit c8509002ac04facf4629d0f9b26620a21d187ee0)

commit 82f53d4fdf97a73c378018fdb1cdac6d9780e80c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libdepends: fixed real_show_up_depends regression #15357

commit 3c62b2a7355d1ea860811400c35d90dfc2ce5e24
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libtriggers: added real_on_pre_cast #15352

commit 8d7629ceb385ee4c494964a548a309bd3093971c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libmisc: mk_tmp_dirs now works also for nonroot-but-uid0 users, patch
              by ruskie #15269

commit 730a679739fb3c4c0ef7cfdf79785f9dc2bd0fac
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    config: made BUILD_DIRECTORY ignore INSTALL_ROOT and user changeable,
              modified patch by eekee #15234

commit 415215d84d03eadeaf75357ababf80731c6e2577
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libcast, libtriggers: made conflicts and triggers unsustaining #15226
    aka another way for the spellwright to damage a system :)
    
    (cherry-picked from commit b38df46514e1ca8500b8bdd5b1353220a74cbcae)

commit 7c5d9daa636029948402a4de5bb3bf058b1198a6
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libtrack: made real_track_manual work with whitespace and optimised
              it #15240, patch by chp

diff --git a/ChangeLog b/ChangeLog
index 9269268..73f999a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-08-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * sustained: removed texinfo #15374
+
+2009-08-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libdepends: fixed real_show_up_depends regression #15357
+       * dl_wget: rename the download to the expected name #15097
+
+2009-08-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libtriggers: added real_on_pre_cast #15352
+
+2009-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libmisc: mk_tmp_dirs now works also for nonroot-but-uid0 users, 
patch
+         by ruskie #15269
+
+2009-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * config: made BUILD_DIRECTORY ignore INSTALL_ROOT and user 
changeable,
+         modified patch by eekee #15234
+
+2009-05-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libtrack: made real_track_manual work with whitespace and optimised
+         it #15240, patch by chp
+       * libcast, libtriggers: made conflicts and triggers unsustaining 
#15226
+
 2009-05-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * dl_git: fixed syntax error
        * libresurrect: fixed installing of spell files from user owned
diff --git a/etc/sorcery/config b/etc/sorcery/config
index db1fdb4..6e75585 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -174,7 +174,8 @@ PROGRESS_SPINNER_CHARS='-\|/'
 
 [  -r  $GRIMOIRE_LIST  ]  &&  .  $GRIMOIRE_LIST
 
-      BUILD_DIRECTORY=${INSTALL_ROOT}/usr/src
+      # no $INSTALL_ROOT, so it stays consistent through INSTALL #15234
+      BUILD_DIRECTORY=${BUILD_DIRECTORY:-/usr/src}
    DOCUMENT_DIRECTORY=${INSTALL_ROOT}/usr/share/doc
 CONFIG_STAGE_DIRECTORY=${STATE_ROOT}/var/state/sorcery/staged_configs
 
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 84f8162..1ebbef4 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.4-rc2
+1.14.4-rc3
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_wget 
b/var/lib/sorcery/modules/dl_handlers/dl_wget
index 27e5f1f..710f392 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_wget
+++ b/var/lib/sorcery/modules/dl_handlers/dl_wget
@@ -63,7 +63,7 @@ function dl_wget_call_wget()  {
   debug 'dl_wget' "$funcname -- $@"
 
   rm -f $FILE
-  wget $WGET_OPTIONS "$URL" 2>&1 &&
+  wget $WGET_OPTIONS -O "$FILE" "$URL" 2>&1 &&
   if ! test -f "$FILE" ; then
     # stupid http site trying to be nice and re-direct us, this is a failure
     # even though wget doesnt notice it...
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 6f19f11..66d1108 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -117,7 +117,7 @@ function run_conflicts() {
       text="$text ${SPELL_COLOR}${spell_and_default[0]}${MESSAGE_COLOR}?"
 
       if  query  "$text"  ${spell_and_default[1]}  ;  then
-        dispel  ${spell_and_default[0]} || rc=1
+        dispel --nosustain ${spell_and_default[0]} || rc=1
         echo  ${spell_and_default[0]} >>  $CONFLICT_LIST
       else
         echo  $SPELL  >>  $FAILED_LIST
diff --git a/var/lib/sorcery/modules/libdepends 
b/var/lib/sorcery/modules/libdepends
index 929ba87..d3673a1 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1636,7 +1636,7 @@ function real_show_up_depends()
     if [[ "$type" == "verbose" ]] ; then
       lock_file "$DEPENDS_STATUS"
       show_up_depends_sub "$1"|while read line; do
-        grep -E "$line(\(.*\))*:" "$DEPENDS_STATUS"
+        grep -e "$line:" -e "$line([^)(]*):" "$DEPENDS_STATUS"
       done
       unlock_file "$DEPENDS_STATUS"
     else
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 35590b3..8e4889f 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1108,8 +1108,8 @@ function mk_tmp_dirs() {
 
 
 
-  tmp=$(ls -ld $BASE_DIR 2>/dev/null|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; }')
-  if [[ "$tmp" != "drwxr-xr-x:root:root" ]] ; then
+  tmp=$(ls -lnd $BASE_DIR 2>/dev/null|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; 
}')
+  if [[ "$tmp" != "drwxr-xr-x:0:0" ]] ; then
     test -d $BASE_DIR &&
     message "$BASE_DIR has unknown permissions and ownership, replacing it" 
>&2
     rm -rf $BASE_DIR
@@ -1118,21 +1118,21 @@ function mk_tmp_dirs() {
   fi || mk_tmp_dir_error $BASE_DIR
 
   # double check
-  tmp=$(ls -ld $BASE_DIR 2>/dev/null|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; }')
-  if [[ "$tmp" != "drwxr-xr-x:root:root" ]] ; then
+  tmp=$(ls -lnd $BASE_DIR 2>/dev/null|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; 
}')
+  if [[ "$tmp" != "drwxr-xr-x:0:0" ]] ; then
     mk_tmp_dir_error $BASE_DIR
   fi
 
 
-  tmp=$(ls -ld $SCRIPT_DIR 2>/dev/null|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; 
}')
-  if [[ "$tmp" != "drwxr-xr-x:root:root" ]] ; then
+  tmp=$(ls -lnd $SCRIPT_DIR 2>/dev/null|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; 
}')
+  if [[ "$tmp" != "drwxr-xr-x:0:0" ]] ; then
     rm -rf $SCRIPT_DIR
     install -d -o root -g root -m 755 "$SCRIPT_DIR"
   fi || mk_tmp_dir_error $SCRIPT_DIR
 
   # double check
-  tmp=$(ls -ld $SCRIPT_DIR|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; }')
-  if [[ "$tmp" != "drwxr-xr-x:root:root" ]] ; then
+  tmp=$(ls -lnd $SCRIPT_DIR|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; }')
+  if [[ "$tmp" != "drwxr-xr-x:0:0" ]] ; then
     mk_tmp_dir_error $SCRIPT_DIR
   fi
 
@@ -1143,8 +1143,8 @@ function mk_tmp_dirs() {
   fi
 
   install -d -o root -g root -m 755 "$FULL_DIR" || mk_tmp_dir_error $FULL_DIR
-  tmp=$(ls -ld $SCRIPT_DIR|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; }')
-  if [[ "$tmp" != "drwxr-xr-x:root:root" ]] ; then
+  tmp=$(ls -lnd $SCRIPT_DIR|awk '{printf "%s:%s:%s\n" ,$1,$3,$4; }')
+  if [[ "$tmp" != "drwxr-xr-x:0:0" ]] ; then
     mk_tmp_dir_error $FULL_DIR
   fi
 
diff --git a/var/lib/sorcery/modules/libtrack 
b/var/lib/sorcery/modules/libtrack
index fb54bed..ef74990 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -42,10 +42,7 @@ function real_track_manual()  {
     echo "Can't tell installwatch to manually track... installwatch isn't 
running."
     return 1
   fi
-  local  i
-  for i in $* ; do
-    [ -e $i ] && touch $i
-  done
+  touch -c "$@"
   return 0
 }
 
diff --git a/var/lib/sorcery/modules/libtriggers 
b/var/lib/sorcery/modules/libtriggers
index a42c099..28d4c5e 100755
--- a/var/lib/sorcery/modules/libtriggers
+++ b/var/lib/sorcery/modules/libtriggers
@@ -149,6 +149,18 @@ function real_on_cast () {
 ## @param spell that triggers
 ## @param action
 ##
+## Used by spells to make adding triggerse nice.
+##
+#---------------------------------------------------------------------
+function real_on_pre_cast() {
+  set_trigger "on_pre_cast" "$1" "$2"
+}
+
+#---------------------------------------------------------------------
+## @Type API
+## @param spell that triggers
+## @param action
+##
 ## Used by spells to make adding triggers nice.
 ##
 #---------------------------------------------------------------------
@@ -189,7 +201,7 @@ function do_trigger () {
         cast -c "${TRIGGER[0]}"
         ;;
       dispel_self)
-        dispel "${TRIGGER[0]}"
+        dispel --nosustain "${TRIGGER[0]}"
         ;;
       check_self)
         cleanse --nofix_quick "${TRIGGER[0]}" ||
diff --git a/var/lib/sorcery/sustained b/var/lib/sorcery/sustained
index d35b8b2..883ca6d 100755
--- a/var/lib/sorcery/sustained
+++ b/var/lib/sorcery/sustained
@@ -37,7 +37,6 @@ smgl-fhs
 smgl-strip
 smgl-prelink
 tar
-texinfo
 unzip
 util-linux
 wget