sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1fdcc2875255a1955c0612c9eba2f14eb9f0611c)
- 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 (1fdcc2875255a1955c0612c9eba2f14eb9f0611c)
- Date: Thu, 28 Aug 2008 12:17:18 -0500
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 2 ++
var/lib/sorcery/modules/build_api/common | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 1fdcc2875255a1955c0612c9eba2f14eb9f0611c
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
diff --git a/ChangeLog b/ChangeLog
index b7279b2..768e3e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
dependencies of removed dependees will be removed, unless they were
specified to cast manually or if some other spell need them; the
dependencies' dependencies get the same treatment #14668/#7164
+ * common: when staging, gather_docs into the stage, the live system is
+ not available at this point (rightly so) #14197
2008-08-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: improved the cleanup algorithm when a spell fails in the
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index af175e7..b22fecb 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
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (1fdcc2875255a1955c0612c9eba2f14eb9f0611c), Jaka Kranjc, 08/28/2008
Archive powered by MHonArc 2.6.24.