Skip to Content.
Sympa Menu

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

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 (b04e448cba60b964e57245a512770e6d5f0a42bb)
  • Date: Tue, 24 Feb 2009 16:34:43 -0600

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

ChangeLog | 7 +++++++
var/lib/sorcery/modules/libdispel | 10 ++++++----
var/lib/sorcery/modules/libmisc | 4 ++--
3 files changed, 15 insertions(+), 6 deletions(-)

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

libdispel: fixed two debug statements, added two new and made pre_
and post_remove numb again

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

libmisc: added missing quotes to right hand side of checks in
smgl_dirname, so unwanted glob expansion doesn't occur; this
fixes the obscure #15051

diff --git a/ChangeLog b/ChangeLog
index d971018..87bf23d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libmisc: added missing quotes to right hand side of checks in
+ smgl_dirname, so unwanted glob expansion doesn't occur; this
+ fixes the obscure #15051
+ * libdispel: fixed two debug statements, added two new and made pre_
+ and post_remove numb again
+
2009-02-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: improve the handling of missing grimoires when a
dependency is referencing another grimoire
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index db357ce..240e5f0 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -119,7 +119,7 @@ function reap_depends() {
function reaper() {
# Example: reaper "$INSTALL_LOG" "$MD5_LOG"

- debug "libsorcery" "Running reaper() on $1"
+ debug "libdispel" "Running reaper() on $1"

if ! [ "$REAP" == "on" ] ||
! [ -f $1 ]; then return
@@ -183,7 +183,7 @@ function reaper() {
function reap_state_files() {
# Example: reaper "$INSTALL_LOG" "$MD5_LOG"

- debug "libsorcery" "Running reap_state_files() on $1"
+ debug "libdispel" "Running reap_state_files() on $1"

local UNIQUE="$$.$RANDOM"
local REAPER_FILES="$TMP_DIR/reaper.$UNIQUE.files"
@@ -284,20 +284,22 @@ function load_spell() {
## Run the PRE_REMOVE script if it exists
#-----
function pre_remove() {
+ debug "libdispel" "pre_remove()"
if [[ $SCRIPT_DIRECTORY ]] ; then
run_spell_file PRE_REMOVE pre_remove
fi
- return $?
+ return 0
}

#-----
## Run the POST_REMOVE script if it exists.
#-----
function post_remove() {
+ debug "libdispel" "post_remove()"
if [[ $SCRIPT_DIRECTORY ]] ; then
run_spell_file POST_REMOVE post_remove
fi
- return $?
+ return 0
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 323cea0..a835713 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1458,7 +1458,7 @@ function smgl_dirname() {

# Pull of any trailing /'s, there could be more than/one///
__dirname=$1
- while [[ $__dirname != $__last_dir ]]; do
+ while [[ $__dirname != "$__last_dir" ]]; do
__last_dir=$__dirname
__dirname=${__dirname%/}
done
@@ -1473,7 +1473,7 @@ function smgl_dirname() {
done

# Pull of any trailing /'s
- while [[ $__dirname != $__last_dir ]]; do
+ while [[ $__dirname != "$__last_dir" ]]; do
__last_dir=$__dirname
__dirname=${__dirname%/}
done



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b04e448cba60b964e57245a512770e6d5f0a42bb), Jaka Kranjc, 02/24/2009

Archive powered by MHonArc 2.6.24.

Top of Page