Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

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

 ChangeLog                                  |   33 
+++++++++++++++++++++++++++++
 etc/sorcery/version                        |    2 -
 usr/sbin/cast                              |   12 +++++-----
 usr/sbin/gaze                              |   12 +++++++---
 var/lib/sorcery/excluded                   |    1 
 var/lib/sorcery/modules/build_api/api2     |    3 +-
 var/lib/sorcery/modules/build_api/common   |    2 -
 var/lib/sorcery/modules/dl_handlers/dl_git |    4 +--
 var/lib/sorcery/modules/libcast            |    6 ++---
 var/lib/sorcery/modules/libdispel          |    2 -
 var/lib/sorcery/modules/libgrimoire        |    2 -
 var/lib/sorcery/modules/libinitd           |    8 +++----
 var/lib/sorcery/modules/libtrack           |    1 
 13 files changed, 64 insertions(+), 24 deletions(-)

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

    1.14.3

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

    1.14.3-rc3

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

    libtrack: avoid an installwatch issue in create_install_log #14835
    
    (cherry-picked from commit 43fd7fc4beb5b1ed3f367edee26076fc91f0a103)

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

    libcast, libinitd, libgrimoire, common: ensure most grimoire files
          have correct ownership #14576
    
    (cherry-picked from commit 1746388975ee2ddb8532422efdb83d91e0ef4cd8)

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

    excluded: added /etc/.pwd.lock to fix #5924
    
    (cherry-picked from commit 15b74ea8bced72cdf600dbe176687e0dd295e51f)

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

    1.14.3-rc2

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

    libcast: fixed a syntax error in custom cppflag setting, patch from
          Mario García H. #14954
    
    (cherry-picked from commit 3105c2ffb4532407e2af6b54444fbe1b36779bd5)

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

    1.14.2-rc6

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

    cast: fixed some horizontal lines in the final output
    
    (cherry-picked from commit bc25b71a4c316ba6deb0487df2ab259bfa350fec)

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

    dl_git: properly propagate errors, the chains were broken
    
    (cherry-picked from commit 7911ebc24f359950d0ad83076a03baf8ed4493e4)

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

    cast: also save stderr in the download log, fixes #14661
    
    (cherry-picked from commit 1dfd04aea32a01bb9fa3a80a3a7e28a69414913f)

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

    libdispel: fixed a duplicate debug message in reap_state_files
    
    (cherry-picked from commit 5bf6fd04543e51471548bac63f30c6d5f0cd7dff)

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

    api2: fixed a build message
    
    (cherry-picked from commit 52f1f1dfca8eb2a556e8f9025e74c191b6256ae0)

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

    gaze: improved what/short when dealing with multiple spells #14839
    
    (cherry-picked from commit 564b4b7db803e9526ecc572e03544098cca6e00f)

diff --git a/ChangeLog b/ChangeLog
index ae4663b..fc33eed 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2009-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * version: 1.14.3 released
+
+2008-12-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libtrack: avoid an installwatch issue in create_install_log #14835
+
+2008-12-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libcast, libinitd, libgrimoire, common: ensure most grimoire files
+         have correct ownership #14576
+
+2008-12-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * excluded: added /etc/.pwd.lock to fix #5924
+
+2008-12-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libcast: fixed a syntax error in custom cppflag setting, patch from
+         Mario García H. #14954
+
+2008-12-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * cast: fixed some horizontal lines in the final output
+
+2008-12-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * cast: also save stderr in the download log, fixes #14661
+       * dl_git: properly propagate errors, the chains were broken
+
+2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libdispel: fixed a duplicate debug message in reap_state_files
+
+2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * api2: fixed a build message
+
+2008-12-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * gaze: improved what/short when dealing with multiple spells #14839
+
 2008-10-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * version: 1.14.2 released
 
diff --git a/etc/sorcery/version b/etc/sorcery/version
index a4cc557..4ea8ad8 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.2
+1.14.3
diff --git a/usr/sbin/cast b/usr/sbin/cast
index c79ca7e..bd37214 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -532,10 +532,10 @@ function pass_three()  {
   fi
 
   if  [[  $SEPARATE   ]] ; then
-    summon_spell "$SPELL" >"$download_log"
+    summon_spell "$SPELL" &> "$download_log"
   else
     lock_file   $download_log
-    summon_spell "$SPELL" >  "$download_log"
+    summon_spell "$SPELL" &> "$download_log"
     unlock_file   $download_log
   fi
 
@@ -638,7 +638,7 @@ function pass_five()  {
   if  [  -s  $CHECK_TRIGGERS_SUCCESS ] ; then
     message "${DEFAULT_COLOR}"
     message "${MESSAGE_COLOR}Spells that had a check_self trigger succeed:"
-    message "-----------------------------------------------${SPELL_COLOR}"
+    message "---------------------------------------------${SPELL_COLOR}"
     for item in `cat $CHECK_TRIGGERS_SUCCESS 2>/dev/null`; do
       message "$item"
     done | column
@@ -648,7 +648,7 @@ function pass_five()  {
   if  [  -s  $CHECK_TRIGGERS_FAILURE ] ; then
     message "${DEFAULT_COLOR}"
     message "${MESSAGE_COLOR}Spells that had a check_self trigger fail:"
-    message "-----------------------------------------------${SPELL_COLOR}"
+    message "------------------------------------------${SPELL_COLOR}"
     for item in `cat $CHECK_TRIGGERS_FAILURE 2>/dev/null`; do
       message "$item"
     done | column
@@ -703,7 +703,7 @@ function pass_five()  {
     if  [  -s  $INSTALL_QUEUE  ] ; then
       message "${MESSAGE_COLOR}The install queue is not empty, "
       message "it still contains the following spells: "
-      message "---------------------------------${PROBLEM_COLOR}"
+      message "---------------------------------------${PROBLEM_COLOR}"
       for item in `cat $INSTALL_QUEUE 2>/dev/null`; do
         message "$item"
       done | column
@@ -723,7 +723,7 @@ function pass_five()  {
   if [[ $deferred_list ]]; then
     message "${MESSAGE_COLOR}Cast deferred installing some configuration 
files."
     message "The following spells have new pending updates: "
-    message "---------------------------------$SPELL_COLOR"
+    message "----------------------------------------------$SPELL_COLOR"
     message "$deferred_list" | column
     message "${MESSAGE_COLOR}Please run confmeld to merge them into your 
system."
     message "$DEFAULT_COLOR"
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 2bd9c51..dc703fe 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1404,13 +1404,13 @@ function gaze_show_short_description() {
           codex_set_current_spell_by_name  $spell           &&
           echo $SHORT
         )                                                 ||
-        { message  "No details found"
+        { message  "No details found! Please file a bug!"
           return 1
         }
     else
       message "$spell -> no such spell"
-      return 1
     fi
+    if ! [[ $GAZE_VERBOSE == 0 ]]; then echo; fi
   done
 }
 
@@ -1432,12 +1432,16 @@ function gaze_show_long_description() {
           codex_get_spell_description  $SPELL_DIRECTORY
         )                                       ||
         {
-          message  "No details found" &&
+          message "No details found! Please file a bug!" &&
           return 1
         }
     else
       message "$spell -> no such spell"
-      return 1
+    fi
+    if [[ $GAZE_VERBOSE == 0 ]]; then
+      echo --- --- ---
+    else
+      echo
     fi
   done
 }
diff --git a/var/lib/sorcery/excluded b/var/lib/sorcery/excluded
index 98e5b79..bd2ef48 100755
--- a/var/lib/sorcery/excluded
+++ b/var/lib/sorcery/excluded
@@ -1,5 +1,6 @@
 ^/dev
 ^/devices
+^/etc/.pwd.lock$
 ^/etc/X11/xdm/Xsession$
 ^/etc/cups/certs
 ^/etc/fstab$
diff --git a/var/lib/sorcery/modules/build_api/api2 
b/var/lib/sorcery/modules/build_api/api2
index d1ca054..94b7eac 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -155,9 +155,10 @@ function run_build()  {
   invoke_gcc2
   optimize
 
-  message -n "Installing in dir: "
+  message -n "Building in dir: "
   pwd
   message "$SPELL    $VERSION"
+  message
 
   run_spell_file BUILD build
 
diff --git a/var/lib/sorcery/modules/build_api/common 
b/var/lib/sorcery/modules/build_api/common
index f3295fe..1fab067 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -218,7 +218,7 @@ function install_pam_confs()  {
     local FILE
     for  FILE  in  `ls`;  do
       if  !  [  -f  $INSTALL_ROOT/etc/pam.d/$FILE  ];  then
-        cp  $FILE   $INSTALL_ROOT/etc/pam.d
+        install -g root -o root "$FILE" "$INSTALL_ROOT/etc/pam.d"
       fi
     done
 
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git 
b/var/lib/sorcery/modules/dl_handlers/dl_git
index 3a8978d..e3ddd24 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -45,7 +45,7 @@ function dl_git_get () {
       ( cd $GIT_DIRECTORY &&
       echo git checkout $GIT_TAG &&
       git checkout $GIT_TAG &&
-      echo git pull $GIT_ROOT $GIT_TAG
+      echo git pull $GIT_ROOT $GIT_TAG &&
       git pull $GIT_ROOT $GIT_TAG )
       rc=$?
       eval "$dl_target=\"$GIT_DIRECTORY\""
@@ -54,7 +54,7 @@ function dl_git_get () {
       echo git clone $GIT_ROOT $GIT_DIRECTORY
       git clone $GIT_ROOT $GIT_DIRECTORY &&
       cd $GIT_DIRECTORY &&
-      echo git checkout $GIT_TAG
+      echo git checkout $GIT_TAG &&
       git checkout $GIT_TAG &&
       cd ../
       rc=$?
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 5ba604c..6f19f11 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -149,8 +149,8 @@ function query_custom_cflags() {
                                17 50 9 \
                                CFLAGS "$USER_SPELL_CFLAGS" \
                                CXXFLAGS "$USER_SPELL_CXXFLAGS" \
-                               LDFLAGS "$USER_SPELL_LDFLAGS"' \
-                               CPPFLAGS "$USER_SPELL_CPPFLAGS"`)
+                               LDFLAGS "$USER_SPELL_LDFLAGS" \
+                               CPPFLAGS "$USER_SPELL_CPPFLAGS"'`)
       rc=$?
       [[ $rc == 0 ]] || [[ $rc == 1 ]] && break
       set ${RESULTS[*]}
@@ -518,7 +518,7 @@ function install_xinetd_sub() {
   local install_dir=$3
   local tmp_file=$TMP_DIR/$bfile
   local inst_file=$install_dir/$bfile
-  cp  $file $tmp_file
+  install -g root -o root $file $tmp_file
 
   set_xinetd_state $tmp_file $state
 
diff --git a/var/lib/sorcery/modules/libdispel 
b/var/lib/sorcery/modules/libdispel
index 5f73918..c123277 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -183,7 +183,7 @@ function reaper()  {
 function reap_state_files()  {
 #  Example:  reaper "$INSTALL_LOG"  "$MD5_LOG"
 
-  debug  "libsorcery" "Running reaper() on $1"
+  debug  "libsorcery" "Running reap_state_files() on $1"
 
   local UNIQUE="$$.$RANDOM"
   local REAPER_FILES="$TMP_DIR/reaper.$UNIQUE.files"
diff --git a/var/lib/sorcery/modules/libgrimoire 
b/var/lib/sorcery/modules/libgrimoire
index cd54495..811b31e 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -184,7 +184,7 @@ function install_desktop_files() {
     file=$(basename $each)
     if ! test -f "$target_dir/$file" ; then
       debug "libgrimoire" "Installing $file in $target_dir as a desktop file"
-      cp $each $target_dir
+      install -g root -o root $each $target_dir
     fi
   done
 }
diff --git a/var/lib/sorcery/modules/libinitd 
b/var/lib/sorcery/modules/libinitd
index 5cb2003..c9b4148 100755
--- a/var/lib/sorcery/modules/libinitd
+++ b/var/lib/sorcery/modules/libinitd
@@ -99,7 +99,7 @@ function _init_merge_config_file()
   fi
 
   local savetime=$( date +'%Y%m%d%H%M' )
-  cp $2 $2.$savetime.backup
+  install -g root -o root $2 $2.$savetime.backup
 
   for opt in $new_opts ; do
     message "  Merging option $opt into $2..."
@@ -144,7 +144,7 @@ function _init_install_conf_files()
       check_if_modified "$target_file" && mark_file_modified "$target_file"
       _init_merge_config_file $file $target_file
     else
-      install -m 644 $file $target_file
+      install -m 644 -g root -o root $file $target_file
       touch $target_file
     fi
   done
@@ -229,11 +229,11 @@ function init_install()
     else
       _init_make_backup $script_path $runlevel_dir/$script_name
       if [ "$enable_script" == "enabled" ] ; then
-        install -m 754 $script_path $runlevel_dir
+        install -m 754 -g root -o root $script_path $runlevel_dir
         message "  script $script_name installed and 
${MESSAGE_COLOR}enabled${DEFAULT_COLOR}. Disable with 'telinit disable 
$script_name'."
         message "${MESSAGE_COLOR}If you want to [re]start the service 
now${DEFAULT_COLOR}, issue 'telinit run $script_name [re]start'."
       else
-        install -m 644 $script_path $runlevel_dir
+        install -m 644 -g root -o root $script_path $runlevel_dir
         message "  script $script_name installed and 
${MESSAGE_COLOR}disabled${DEFAULT_COLOR}. Enable with 'telinit enable 
$script_name'."
       fi
       _init_install_conf_files $( _init_get_conf_files $script_path )
diff --git a/var/lib/sorcery/modules/libtrack 
b/var/lib/sorcery/modules/libtrack
index 9e9a29b..fb54bed 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -227,6 +227,7 @@ function create_install_log()  {
     filter_excluded                     > $OUTPUT
   else
     parse_iw $INPUT                     |
+    sed "s#/\(\./\)\+#/#g"              |
     sort                                |
     uniq                                |
     install_log_filter $INSTALL_ROOT "" |