Skip to Content.
Sympa Menu

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

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 (bb65d3327da9b2bd5c6ad8348f3c521207a0576a)
  • Date: Fri, 11 Jan 2008 14:36:31 -0600

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

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

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

changelog entry for the previous "wip" commit
(cherry picked from commit f85e652b57f105674236d0a8bf2677b04ac3bfac)

Conflicts:

ChangeLog
(cherry picked from commit 130253f795f51d2b7a8d01d08410e2c8bdef434f)

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

wip: libdepends optimisations for stable
(cherry picked from commit a7007c512d96434a482ad3a9628d7c6698946042)
(cherry picked from commit 61345e62d0b761ef6d808b360dc13ed6e838f8d2)
(cherry picked from commit e088970a3aa1b0e629fd712d096801ad540dde00)

diff --git a/ChangeLog b/ChangeLog
index 4db7787..4133aee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2007-12-31 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* liblock: avoid two possible tiny race conditions

+2007-11-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: finally satisfactorily fixed the sorcery rebuild
pausing for
+ hours #13735
+
2007-11-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sorcery: rewrote show_installed_spell and fixed remove_pkgs -
removing
spells from the sorcery menu works again
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 83096e5..a631e5d 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -383,7 +383,7 @@ function compute_uninstalled_depends()
local spell spells
spells=( $@ )

- PRETEND_NOT_INSTALLED=$(echo "$@"|tr " " "\n")
+ PRETEND_NOT_INSTALLED=" $@ "

local _idx

@@ -510,7 +510,7 @@ function private_should_cast()
# order is important here...
if ! codex_does_spell_exist $1; then
return 1
- elif echo "$PRETEND_NOT_INSTALLED" | grep -x -q "$1" ; then
+ elif echo "$PRETEND_NOT_INSTALLED" | grep -q " $1 " ; then
# always look at stuff on the command line unless its exiled
return 0
# from here on the spell was not on the command line...
@@ -931,7 +931,7 @@ function work_depends_provider()
# check if we've already answered this question
if [[ ! $default ]]; then
for tmp in $CANDIDATES; do
- echo ${spells[@]} | tr " " "\n"| grep -x -q "$tmp" && default=$tmp &&
break
+ echo " ${spells[@]} " | grep -q " $tmp " && default=$tmp && break
done
fi

@@ -1056,7 +1056,7 @@ function work_optional_depends_provider()
# check if we've already answered this question
if [[ ! $default ]]; then
for tmp in $CANDIDATES; do
- echo ${spells[@]} | tr " " "\n" | grep -x -q "$tmp" && default=$tmp &&
break
+ echo " ${spells[@]} " | grep -q " $tmp " && default=$tmp && break
done
fi

@@ -1162,8 +1162,7 @@ function work_optional_depends_spell()
# check the install queue
if [[ ! $default ]]; then
debug "libdepends" "Checking in queue"
- #\< and \> match the empty string at the start and end of a word
- echo ${spells[@]}|tr " " "\n" | grep -x -q "$1" && default=on
+ echo " ${spells[@]} " | grep -q " $1 " && default=on
fi

# check if installed/held
@@ -1282,7 +1281,7 @@ function private_up_trigger() {

# afk 6-7-06 Im not sure this line is correct, it seems to only
# make a circular depends, instead we want $TARGET to depend on $SPELL
- echo ${NEW_DEPENDS[@]} |tr " " "\n"| grep -x -q "$TARGET" ||
+ echo " ${NEW_DEPENDS[@]} " | grep -q " $TARGET " ||
NEW_DEPENDS=( ${NEW_DEPENDS[*]} $spell)

triggerees=( ${triggerees[*]} $TARGET )



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (bb65d3327da9b2bd5c6ad8348f3c521207a0576a), Jaka Kranjc, 01/11/2008

Archive powered by MHonArc 2.6.24.

Top of Page