sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Andrew Stitt (14d235bdee304e0c66c12ba8ea3536b219b60c9e)
- From: Andrew Stitt <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by Andrew Stitt (14d235bdee304e0c66c12ba8ea3536b219b60c9e)
- Date: Sat, 25 Nov 2006 12:46:14 -0600
GIT changes to master sorcery by Andrew Stitt <astitt AT sourcemage.org>:
ChangeLog | 4 ++++
var/lib/sorcery/modules/libdepends | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 14d235bdee304e0c66c12ba8ea3536b219b60c9e
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>
fix bug 11865, ignore stored sub_depends if the requester has been
processed already.
diff --git a/ChangeLog b/ChangeLog
index 63b18a6..d6d43e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
2006-11-25 Andrew Stitt <astitt AT sourcemage.org>
+ * libdepends: fix bug 11865, ignore stored sub-depends if the
+ requesting spell has already been processed.
+
+2006-11-25 Andrew Stitt <astitt AT sourcemage.org>
* cleanse: add runtime/suggest support to prune, bug 13250
2006-11-25 Andrew Stitt <astitt AT sourcemage.org>
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 470a8e0..a1cb2e9 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -184,6 +184,10 @@ function run_our_sub_depends() {
sub_dependee=${tmp#*:};
sub_depends=${triple##*:}
+ # if the requester has been processed skip any sub-depends its
+ # previous instance requested, bug 11865
+ [[ $(hash_get "depends_looked_at" "$requester") == done ]] && continue
+
process_sub_depends "$requester" "$sub_dependee" "$sub_depends" ||
return 1
done
@@ -1519,7 +1523,6 @@ function depends_message() {
message ""
}
-
#########################BEGIN OTHER STUFF############################
#---------------------------------------------------------------------
- [SM-Commit] GIT changes to master sorcery by Andrew Stitt (14d235bdee304e0c66c12ba8ea3536b219b60c9e), Andrew Stitt, 11/25/2006
Archive powered by MHonArc 2.6.24.