Skip to Content.
Sympa Menu

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

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 (ecec7ab09a42c23e4ede12c6d9dd2c9affaec8d8)
  • Date: Sun, 25 Jun 2006 23:35:49 -0500

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

ChangeLog | 6 ++++++
var/lib/sorcery/modules/build_api/api1 | 2 --
var/lib/sorcery/modules/build_api/api2 | 2 --
3 files changed, 6 insertions(+), 4 deletions(-)

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

removed the code to create the stage root for parts that used to need it
but doesn't anymore because we removed the code in installwatch that checks
for it

diff --git a/ChangeLog b/ChangeLog
index aca0110..198c4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
2006-06-25 David Brown <dmlb2000 AT gmail.com>
+ * build_api/api1: removed calls to prepare and destroy stage
+ root since we patched install watch they aren't needed
+ * build_api/api2: comment also not relevent for the above
+ reasons
+
+2006-06-25 David Brown <dmlb2000 AT gmail.com>
* build_api/api2: moved prepare_stage_root to inside staged
install check (bug #12759)

diff --git a/var/lib/sorcery/modules/build_api/api1
b/var/lib/sorcery/modules/build_api/api1
index cd7e5e3..a47f1ab 100755
--- a/var/lib/sorcery/modules/build_api/api1
+++ b/var/lib/sorcery/modules/build_api/api1
@@ -124,7 +124,6 @@ function run_build() {
invoke_build_dir
invoke_gcc2
optimize
- prepare_stage_root
invoke_installwatch

message -n "Installing in dir: "
@@ -270,7 +269,6 @@ function real_default_post_build() {
install_desktop_files
gather_docs
devoke_installwatch
- destroy_stage_root
init_post_install
ldconfig
# release_saved_libraries
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index cb2b18c..ed15cdb 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -65,8 +65,6 @@ function run_build_spell() {
(
run_build &&
run_pre_install &&
-# you have to make this directory every time even if you don't use it because
-# it's a bug with installwatch that it needs to exist at all times
invoke_installwatch &&
if [[ "$STAGED_INSTALL" != "off" ]]
then



  • [SM-Commit] GIT changes to master sorcery by David Brown (ecec7ab09a42c23e4ede12c6d9dd2c9affaec8d8), David Brown, 06/26/2006

Archive powered by MHonArc 2.6.24.

Top of Page