Skip to Content.
Sympa Menu

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

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 (755a5974463d3978bad1620a4abd220b57b1982b)
  • Date: Sun, 30 Mar 2008 07:46:32 -0500

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

ChangeLog | 1 +
var/lib/sorcery/modules/build_api/common | 4 ----
var/lib/sorcery/modules/libgrimoire | 1 +
3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 755a5974463d3978bad1620a4abd220b57b1982b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

removed useless block in the preprevious commit

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

libgrimoire: dereference the deaddir in rm_source_dir #14399

diff --git a/ChangeLog b/ChangeLog
index a133f65..32b1869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
functions, since they were broke after the 2008-03-26 esc_str fix
* common: check if the iw log exists before using it in
run_spell_succes
* libtrack: reformatted exists() and made it use a local variable
+ * libgrimoire: dereference the deaddir in rm_source_dir #14399

2008-03-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libmedia: reset the color in the CHECK_ and MESSAGE_COLOR
definitions, so
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 3696807..bdf1796 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -329,10 +329,6 @@ function run_spell_success() {
"$DEFAULT_COLOR"

rm_source_dir
- if [[ $STAGED_INSTALL != off ]]
- then
- destroy_stage_root
- fi
rm -f "$C_LOG" "$spell_sub_depends" "$spell_rsub_depends"
"$spell_depends"
return
fi
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 0b0ef5c..4efb3e8 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -63,6 +63,7 @@ function real_mk_source_dir() {
function real_rm_source_dir() {

local dead_dir="${1:-$SOURCE_DIRECTORY}"
+ dead_dir=$(readlink -f "$dead_dir")

debug "libgrimoire" "Running rm_source_dir() on $dead_dir"




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (755a5974463d3978bad1620a4abd220b57b1982b), Jaka Kranjc, 03/30/2008

Archive powered by MHonArc 2.6.24.

Top of Page