Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (d3fa2b1dae96653287bac89da260d1896f09835c)

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 devel-stage-root sorcery by David Brown (d3fa2b1dae96653287bac89da260d1896f09835c)
  • Date: Tue, 20 Jun 2006 22:38:11 -0500

GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>:

var/lib/sorcery/modules/build_api/common | 8 +++++++-
var/lib/sorcery/modules/libsorcery | 23 ++++++++++++++---------
2 files changed, 21 insertions(+), 10 deletions(-)

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

updated save_binaries to not have problems with symlinks... and also
updated the hack to go along with it

diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index f220359..61abc80 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -132,7 +132,13 @@ function real_prepare_install() { (
fi
)
# TODO this is a dirty hack we need to remove it
- export PATH="$SOURCE_DIRECTORY/old.binaries:$PATH"
+ for dir in $( find $SOURCE_DIRECTORY/old.binaries )
+ do
+ if [[ -d $dir ]]
+ then
+ export PATH="$dir:$PATH"
+ fi
+ done
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index c90e7ac..0e33b66 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -300,7 +300,7 @@ ## Also runs ldconfig with the saved lib
##
#---------------------------------------------------------------------
function save_binaries() {
-
+ local dir
if [ -z "$SOURCE_DIRECTORY" ]
then return
fi
@@ -325,14 +325,14 @@ function save_binaries() {
grep -q "executable"
then
if [ -h $LINE ]; then
- DEST=$( basename $( readlink "$LINE" ) )
- if [ ! -f $OLD_BINS/`basename $LINE` ] ; then
- ln -sf $DEST $OLD_BINS/`basename $LINE`
- fi
+ DEST=$( readlink "$LINE" )
+ mkdir -p $( dirname $OLD_BINS/$LINE )
+ ln -sf $DEST $OLD_BINS/$LINE
else
- cp $LINE $OLD_BINS
+ mkdir -p $( dirname $OLD_BINS/$LINE )
+ cp $LINE $OLD_BINS/$LINE
fi
- echo $OLD_BINS/`basename $LINE` >> $SAVED
+ echo $OLD_BINS/$LINE >> $SAVED
fi


@@ -340,8 +340,13 @@ function save_binaries() {

unlock_file $SAVED

- export PATH=$( envar_prepend_path "$OLD_BINS" "$PATH" )
-
+ for dir in $( find $OLD_BINS )
+ do
+ if [[ -d $dir ]]
+ then
+ export PATH=$( envar_prepend_path "$dir" "$PATH" )
+ fi
+ done
}





  • [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (d3fa2b1dae96653287bac89da260d1896f09835c), David Brown, 06/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page