Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (bae577e82b658752ad297285b269464424e06952)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (bae577e82b658752ad297285b269464424e06952)
  • Date: Fri, 1 Dec 2006 01:08:44 -0600

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 2 ++
usr/sbin/delve | 11 +++++++----
var/lib/sorcery/modules/build_api/api2 | 11 +++++++----
3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit bae577e82b658752ad297285b269464424e06952
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

we only need to set staged install variable only if its not already set

diff --git a/ChangeLog b/ChangeLog
index d8f8e2c..869e4de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* libtrack: forgot to run stage root files list through exclude filter
* libtrack: is_castfs_installed quieted all the errors and output
messages saying if it's enabled or disabled
+ * build_api/api2: need to set STAGED_INSTALL if its not already set
+ * delve: set STAGED_INSTALL if its not already set

2006-11-30 Andrew Stitt <astitt AT sourcemage.org>
* cleanse: fix typo, missing ;;
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 5d10783..edbb8fe 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -390,11 +390,14 @@ function main() {

if [[ -z $CHROOT_CHECK ]]
then
- if ! is_castfs_installed
+ if [[ -z $STAGED_INSTALL ]]
then
- STAGED_INSTALL=off
- else
- STAGED_INSTALL=on
+ if ! is_castfs_installed
+ then
+ STAGED_INSTALL=off
+ else
+ STAGED_INSTALL=on
+ fi
fi
fi

diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index c1fe952..0da37c7 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -55,11 +55,14 @@ function run_build_spell() {
VOYEUR_STDERR=/dev/null
fi

- if ! is_castfs_installed
+ if [[ -z $STAGED_INSTALL ]]
then
- STAGED_INSTALL=off
- else
- STAGED_INSTALL=on
+ if ! is_castfs_installed
+ then
+ STAGED_INSTALL=off
+ else
+ STAGED_INSTALL=on
+ fi
fi

local PROTECT_SORCERY=yes



  • [SM-Commit] GIT changes to master sorcery by David Brown (bae577e82b658752ad297285b269464424e06952), David Brown, 12/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page