Skip to Content.
Sympa Menu

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

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 (ecf7b377341efff00033d712064f3534a4c1ac43)
  • Date: Sat, 11 Aug 2007 10:37:19 -0500

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

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

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

moved the load_libcompat call before the sourcing of DETAILS
in codex_set_current_spell

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

fixed a regression in private_add_depends, probably fixes #13735

diff --git a/ChangeLog b/ChangeLog
index 171bb44..14ce014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: fixed a regression in private_add_depends;
+ probably fixes #13735
+ * libcodex: moved the load_libcompat call before the sourcing of
DETAILS in
+ codex_set_current_spell. This way fallbacks can be used there as
well,
+ which will among other things help a bit with #13883
+
2007-08-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* etc/sorcery/url: added default value for PERL_CPAN_URL #13673
* gaze: fixed PERL_CPAN_URL in mirrors list in gaze system-info #13553
diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index d48d329..a7d8450 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -613,6 +613,9 @@ function codex_set_current_spell() {
[[ -x $GRIMOIRE/API_VERSION ]] && . $GRIMOIRE/API_VERSION
[[ -x $SECTION_DIRECTORY/API_VERSION ]] && . $SECTION_DIRECTORY/API_VERSION

+ # load compatibility functions needed for any stage of cast
+ load_libcompat
+
debug "libcodex" "sourcing DETAILS"
persistent_load
. $SPELL_DIRECTORY/DETAILS 1>/dev/null 2>&1
@@ -620,9 +623,6 @@ function codex_set_current_spell() {

STAGE_DIRECTORY=$BUILD_DIRECTORY/stage-$SPELL-$VERSION

- # load compatibility functions needed for any stage of cast
- load_libcompat
-
# set a default build api if there isn't one already
# this isn't strictly necessary as other code should be able to handle the
# lack of this variable, but I want to play it safe.
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index a1cb2e9..38805e6 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1469,7 +1469,7 @@ function private_add_depends()
# force implied basesystem dependency in the depends tree
if [[ $FORCE_BASESYSTEM_DEPENDS == on ]] &&
[[ $SPELL != basesystem ]] &&
- ! echo $base_deps|grep -x -q "$SPELL"; then
+ ! echo "$base_deps"|grep -x -q "$SPELL"; then
hash_append "$CAST_HASH" "$SPELL" "basesystem"
hash_append "$BACK_CAST_HASH" "basesystem" "$SPELL"
fi



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (ecf7b377341efff00033d712064f3534a4c1ac43), Jaka Kranjc, 08/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page