Skip to Content.
Sympa Menu

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

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 (f29c439d5f9a4db050d89f70b9ce6990242c27e8)
  • Date: Sat, 17 Sep 2016 17:40:48 +0000

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

ChangeLog | 3 +++
usr/sbin/dispel | 10 +++++-----
var/lib/sorcery/modules/dl_handlers/dl_tla | 2 +-
var/lib/sorcery/modules/libapi | 2 +-
var/lib/sorcery/modules/libsorcery | 2 +-
5 files changed, 11 insertions(+), 8 deletions(-)

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

debug: fixed callers without first param, breaking in bash 4.4

Variable substitution checks for variable-name friendly characters now
and some of our callers had extra ones, producing errors.

Before ${!asd} returned an empty value regardless of what was stored in
$asd.

diff --git a/ChangeLog b/ChangeLog
index 0f1a3d9..39b3450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-09-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * debug: fixed callers without first param, breaking in bash 4.4
+
2016-08-31 David C. Haley <khoralin AT gmail.com>
* licenses: added AGPL (v3) updated license list

diff --git a/usr/sbin/dispel b/usr/sbin/dispel
index c4a4ac7..25e6dc9 100755
--- a/usr/sbin/dispel
+++ b/usr/sbin/dispel
@@ -260,14 +260,14 @@ function dispel_children() {
hash_get_ref down_deps $spell dependencies
list_add our_children $dependencies
done
- debug "children of $1 -> $our_children"
+ debug dispel "children of $1 -> $our_children"

local is_orphan is_gone
local orphan_list non_orphan_list
for child in $our_children; do
hash_get_ref ALL_DISPELS $child is_gone
if [[ $is_gone == yes ]]; then
- debug "someone depends on $child but it was already removed"
+ debug dispel "someone depends on $child but it was already removed"
continue
fi
# determine if this child is becomming an orphan or not
@@ -300,9 +300,9 @@ function dispel_children() {
fi
done
for child in $non_orphan_list; do
- debug "looking at non-orphan $child:"
- #debug "parents: $(hash_get up_deps $child)"
- #debug "children: $(hash_get down_deps $child)"
+ debug dispel "looking at non-orphan $child:"
+ #debug dispel "parents: $(hash_get up_deps $child)"
+ #debug dispel "children: $(hash_get down_deps $child)"
if dispel_child_query "$child" "is not an orphan" \
"Would you like to dispel it" \
"${NONORPHAN_DEFAULT}" ; then
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_tla
b/var/lib/sorcery/modules/dl_handlers/dl_tla
index 4c70b89..716d2e3 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_tla
+++ b/var/lib/sorcery/modules/dl_handlers/dl_tla
@@ -42,7 +42,7 @@ function dl_tla_get() {
continue
}
else
- debug "archive $TLA_ARCHIVE is already registered"
+ debug "dl_tla" "archive $TLA_ARCHIVE is already registered"
fi
if test -d $target; then
pushd $target &>/dev/null &&
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index 4b75ccd..5457089 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -835,7 +835,7 @@ function persistent_add () {
##
#---------------------------------------------------------------------
function persistent_clear () {
- debug "persistent_clear - $*"
+ debug "libapi" "persistent_clear - $*"
real_persistent_clear "$@"
}

diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index bf405cc..5d14238 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -628,7 +628,7 @@ function optimize() {
export CPPFLAGS="$OVERRIDE_CPPFLAGS"
else
set_architecture
- debug "ARCHITECTURE='${ARCHITECTURE}'"
+ debug "libsorcery" "ARCHITECTURE='${ARCHITECTURE}'"
debug "libsorcery" "TARGET='${TARGET}'"
debug "libsorcery" "OPTIMIZATIONS='${OPTIMIZATIONS}'"
BUILD=${HOST}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f29c439d5f9a4db050d89f70b9ce6990242c27e8), Jaka Kranjc, 09/17/2016

Archive powered by MHonArc 2.6.24.

Top of Page