Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (664c60e24c33b98abf1108b0cc98e4b7462176d8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (664c60e24c33b98abf1108b0cc98e4b7462176d8)
  • Date: Fri, 13 Aug 2010 07:38:22 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 6 ++++++
var/lib/sorcery/modules/build_api/common | 6 +-----
var/lib/sorcery/modules/libgrimoire | 4 ++--
var/lib/sorcery/modules/libunpack | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 664c60e24c33b98abf1108b0cc98e4b7462176d8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libgrimoire: don't hardcode the build dir, patch from Pol Vinogradov,
bug #15501

commit 2321470ee6cdf637a7d56a8610ddd3b24a69191a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

common: fixed gather_docs needlessly thinking about the dest dir,
patch from Andraž Levstik #15503

commit 1077a9a503b591e59f60256168feec78c778364a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libunpack: follow symlinks in real_guess_compressor, patch from
Kirikaza #15767

diff --git a/ChangeLog b/ChangeLog
index aeb226d..aca4b0e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
* libspell: always run the pre_function in run_spell_file
* api2: run optimize right before build so the persistent variables
are
available and per-spell flags can work #15782
+ * libunpack: follow symlinks in real_guess_compressor, patch from
+ Kirikaza #15767
+ * common: fixed gather_docs needlessly thinking about the dest dir,
+ patch from Andraž Levstik #15503
+ * libgrimoire: don't hardcode the build dir, patch from Pol
Vinogradov,
+ bug #15501

2010-07-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtrack, libdispel: use the correct whole-line option for grep
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index e7b8a50..9c834d7 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -140,11 +140,7 @@ function real_gather_docs() { (

debug "libgrimoire" "Running gather_docs() on $SPELL DOCS=$DOCS"

- if [[ $STAGED_INSTALL == off ]]; then
- DEST_DIR=$DOCUMENT_DIRECTORY/$SPELL
- else
- DEST_DIR=$STAGE_DIRECTORY/TRANSL/$DOCUMENT_DIRECTORY/$SPELL
- fi
+ DEST_DIR=$DOCUMENT_DIRECTORY/$SPELL
mkdir -p $DEST_DIR

cd $SOURCE_DIRECTORY
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index b2bdef7..9c6285d 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -97,8 +97,8 @@ function real_rm_source_dir() {
# a) $dead_dir being an empty string
# b) $dead_dir being set to "/" (or anything above /usr/src)
# c) $dead_dir containing metacharacters (like newline)
- mv "$dead_dir" "$INSTALL_ROOT/usr/src/deaddir" &&
- rm -rf "$INSTALL_ROOT/usr/src/deaddir" 2> /dev/null
+ mv "$dead_dir" "$BUILD_DIRECTORY/deaddir" &&
+ rm -rf "$BUILD_DIRECTORY/deaddir" 2> /dev/null

popd 2>&1 > /dev/null
true
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index 92963b8..d7bf9a9 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -253,7 +253,7 @@ function real_guess_compressor() {
# NOTE: if the file doesn't exist, `file' still completes successfully
# the COMPRESSOR value in this case will be "can't"

- local OUTPUT="$($FILEPROG -b "$1")"
+ local OUTPUT="$($FILEPROG -L -b "$1")"
local COMPRESSOR="$(echo "$OUTPUT" | cut -d ' ' -f1)"
[ "$COMPRESSOR" = "GNU" -o "$COMPRESSOR" = "POSIX" ] &&
COMPRESSOR="$(echo "$OUTPUT" | cut -d ' ' -f2)"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (664c60e24c33b98abf1108b0cc98e4b7462176d8), Jaka Kranjc, 08/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page