Skip to Content.
Sympa Menu

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

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 (f62c45ae3a238869654a178d9f6be5e0c19fa54a)
  • Date: Sat, 23 Dec 2006 12:51:04 -0600

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

ChangeLog | 5 +++++
var/lib/sorcery/modules/build_api/api2 | 4 ++--
var/lib/sorcery/modules/libtrack | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)

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

track_manual did not work with staged install so had to put in a check to
fix it, also STAGED_INSTALL variable needs to be exported so the delve
running in the chroot will have it set properly

diff --git a/ChangeLog b/ChangeLog
index 3f29b8d..d7bec3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-23 David Brown <dmlb2000 AT gmail.com>
+ * libtrack: track_manual needs to work when staged install is enabled
+ * build_api/api2: STAGED_INSTALL variable should be exported so delve
+ will have that variable set properly during INSTALL
+
2006-12-21 David Brown <dmlb2000 AT gmail.com>
* libsorcery: filter/filter_in removed debugging and tabs from
previous commit (stupid me)
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index ed4a28c..831a025 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -59,9 +59,9 @@ function run_build_spell() {
then
if ! is_castfs_installed
then
- STAGED_INSTALL=off
+ export STAGED_INSTALL=off
else
- STAGED_INSTALL=on
+ export STAGED_INSTALL=on
fi
fi

diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 2824bd6..c6e2169 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -37,7 +37,8 @@ function exists() {
##
#---------------------------------------------------------------------
function real_track_manual() {
- if [[ -z "$INSTALLWATCHFILE" ]]; then
+ if [[ -z "$STAGED_INSTALL" || $STAGED_INSTALL == off ]] &&
+ [[ -z "$INSTALLWATCHFILE" ]] ; then
echo "Can't tell installwatch to manually track... installwatch isn't
running."
return 1
fi



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

Archive powered by MHonArc 2.6.24.

Top of Page