Skip to Content.
Sympa Menu

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

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 (102107e3057954ce868a3f6e1f70d237ace599e4)
  • Date: Tue, 30 Oct 2007 06:05:20 -0500

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libdepends | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)

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

libdepends: fixed some more quoting regressions since stable. Should
eliminate some bad provider query defaults

diff --git a/ChangeLog b/ChangeLog
index e631533..88e6b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: fixed some more quoting regressions since stable. Should
+ eliminate some bad provider query defaults
+
2007-09-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
* libmisc: support rxvt-unicode for terminal title setting

diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 38805e6..808c646 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -918,14 +918,14 @@ function work_depends_provider()
# check if theres an abandoned answer, but only if its still a provider
if [[ ! $default ]] && [ -e $ABANDONED_DEPENDS/$SPELL ] ; then
tmp=$(search_depends_status $ABANDONED_DEPENDS/$SPELL "$SPELL"
".*($1)"|awk -F: '{print $2;exit}')
- [[ $tmp ]] && echo $CANDIDATES|grep -x -q "$tmp" && default=$tmp
+ [[ $tmp ]] && echo "$CANDIDATES" | grep -x -q "$tmp" && default=$tmp
fi

# check if theres a default provider
if [[ ! $default ]]; then
explode "$(search_default_provider $DEFAULT_PROVIDERS ".*" "$1")" ":"
"status"
tmp=${status[0]}
- [[ $tmp ]] && echo $CANDIDATES|grep -x -q "$tmp" && default=$tmp
+ [[ $tmp ]] && echo "$CANDIDATES" | grep -x -q "$tmp" && default=$tmp
fi

# check if we've already answered this question
@@ -1023,7 +1023,7 @@ function work_optional_depends_provider()
# check if theres an abandoned answer, but only if its still a provider
if [[ ! $default ]] && [ -e $ABANDONED_DEPENDS/$SPELL ] ; then
tmp=$(search_depends_status_simple $ABANDONED_DEPENDS/$SPELL "$SPELL"
".*($1)" "on"|awk -F: '{print $2;exit}')
- if [[ $tmp ]] && echo $CANDIDATES|grep -x -q "$tmp" ; then
+ if [[ $tmp ]] && echo "$CANDIDATES" | grep -x -q "$tmp" ; then
default=$tmp
else
tmp=$(search_depends_status_simple $ABANDONED_DEPENDS/$SPELL "$SPELL"
".*($1)" "off")
@@ -1045,7 +1045,7 @@ function work_optional_depends_provider()
# if the user said "on" use the default rather than none
# unless theres something wrong with the provider they chose
# in which case fall back to none
- [[ $tmp ]] && echo $CANDIDATES|grep -x -q "$tmp" &&
+ [[ $tmp ]] && echo "$CANDIDATES" | grep -x -q "$tmp" &&
default=$tmp || default=none
else
default=none



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (102107e3057954ce868a3f6e1f70d237ace599e4), Jaka Kranjc, 10/30/2007

Archive powered by MHonArc 2.6.24.

Top of Page