Skip to Content.
Sympa Menu

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

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 (8a6ecb91d39930205b3c0f6adbe327a5479bb83e)
  • Date: Tue, 26 Aug 2008 12:15:22 -0500

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

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

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

libdepends: made two variables explicitly local

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

libdepends: look up the basesystem dependencies only once

diff --git a/ChangeLog b/ChangeLog
index c47fc5f..7368b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: look up the basesystem dependencies only once
+ made two variables explicitly local
+
2008-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: removed a variable leak causing problems for hard deps
on
providers - previous query's choice was used as default, usually
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index d2d45a5..3c321e8 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -401,6 +401,11 @@ function compute_uninstalled_depends()
local _idx
local looked_at

+ # this is a list of all spells basesystem depends on it is used to
+ # avoid loops with the "everything depends on basesystem" feature
+ local base_deps
+ base_deps=$(search_depends_status $DEPENDS_STATUS basesystem|cut -f2 -d:)
+
# All specified spells are assumed to be not installed, or else -c and -r
# would have to be specified all the time.

@@ -449,12 +454,6 @@ function private_run_depends()

hash_put "depends_looked_at" "$SPELL" "start"

- # move this up to compute_uninstalled_depends?
- # this is a list of all spells basesystem depends on it is used to
- # avoid loops with the "everything depends on basesystem" feature
- local base_deps
- base_deps=$(search_depends_status $DEPENDS_STATUS basesystem|cut -f2 -d:)
-
# We only need to run the stuff if we are going to be casting.
# It only needs to be added to the casting hash table if we are
# really casting it
@@ -1009,6 +1008,7 @@ function work_depends_provider()
fi
fi

+ local provider
select_provider "provider" "$default" 0 $CANDIDATES

private_common_depends "$provider($1)" "on" "$database_term" "$2" ""
@@ -1152,6 +1152,7 @@ function work_optional_depends_provider()
fi
fi

+ local provider
select_provider "provider" "$default" 1 $CANDIDATES

if [ $provider == "none" ] ; then



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (8a6ecb91d39930205b3c0f6adbe327a5479bb83e), Jaka Kranjc, 08/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page