sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (1fd4916c3258399e980a92e8d335001310ece885)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (1fd4916c3258399e980a92e8d335001310ece885)
- Date: Thu, 28 Aug 2008 12:33:56 -0500
GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 7 +++++++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/build_api/common | 6 +++++-
var/lib/sorcery/modules/libdepends | 2 ++
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 1fd4916c3258399e980a92e8d335001310ece885
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
1.14.1 :D
commit d7f59cbfaeb3b80208a31fe2bb5b1f3bb7154cac
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
common: when staging, gather_docs into the stage, the live system is
not available at this point (rightly so) #14197
(cherry-picked from commit 1fdcc2875255a1955c0612c9eba2f14eb9f0611c)
commit 8d091bbc5380b6e7535c27f853c5e5065a3d0e82
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libdepends: made two variables explicitly local
(cherry-picked from commit 8a6ecb91d39930205b3c0f6adbe327a5479bb83e)
diff --git a/ChangeLog b/ChangeLog
index a51ca66..4b08bc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * common: when staging, gather_docs into the stage, the live system is
+ not available at this point (rightly so) #14197
+
+2008-08-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ 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/etc/sorcery/version b/etc/sorcery/version
index 1a9fdf3..63e799c 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc7
+1.14.1
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index debaac5..211e150 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -169,7 +169,11 @@ function real_gather_docs() { (
debug "libgrimoire" "Running gather_docs() on $SPELL DOCS=$DOCS"
- DEST_DIR=$DOCUMENT_DIRECTORY/$SPELL
+ if [[ $STAGED_INSTALL == off ]]; then
+ DEST_DIR=$DOCUMENT_DIRECTORY/$SPELL
+ else
+ DEST_DIR=$STAGE_DIRECTORY/TRANSL/$DOCUMENT_DIRECTORY/$SPELL
+ fi
mkdir -p $DEST_DIR
cd $SOURCE_DIRECTORY
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 44fd654..37c1638 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -971,6 +971,7 @@ function work_depends_provider()
fi
fi
+ local provider
select_provider "provider" "$default" 0 $CANDIDATES
private_common_depends "$provider($1)" "on" "$database_term" "$2" ""
@@ -1114,6 +1115,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 test-1.14 sorcery by Jaka Kranjc (1fd4916c3258399e980a92e8d335001310ece885), Jaka Kranjc, 08/28/2008
Archive powered by MHonArc 2.6.24.