Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-1.15 sorcery by Jaka Kranjc (fbfada5bd2de363237e9e247c4c3167cf3e788c9)

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 stable-1.15 sorcery by Jaka Kranjc (fbfada5bd2de363237e9e247c4c3167cf3e788c9)
  • Date: Wed, 22 Apr 2015 12:21:31 -0500

GIT changes to stable-1.15 sorcery by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

ChangeLog | 8 ++++++++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/build_api/common | 5 ++---
var/lib/sorcery/modules/libdepengine | 17 +++++++++++++++++
4 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit 473f67726b68f579188632dd7f161e7c3b21a0ec
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.15.4-rc2

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

libdepengine: made the new uncommited message a debug one and moved it

... outside of its loop

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

build_api/common, libdepengine: Delete uncommitted depends files only
after all spells are cast, preserving configuration for triggered
casts #662

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

version bump

diff --git a/ChangeLog b/ChangeLog
index cd9c7ce..1d7573c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-04-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * version: 1.15.4 released!
+
+2015-04-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * build_api/common, libdepengine: Delete uncommitted depends files
only
+ after all spells are cast, preserving configuration for triggered
+ casts #662
+
2015-02-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* version: 1.15.3 released!

diff --git a/etc/sorcery/version b/etc/sorcery/version
index f2380cc..e34208c 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.15.3
+1.15.4
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 57edb2b..331d823 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -311,7 +311,7 @@ function run_spell_success() {
"$DEFAULT_COLOR"

rm_source_dir
- rm -f "$C_LOG" "$spell_sub_depends" "$spell_rsub_depends"
"$spell_depends"
+ rm -f "$C_LOG"
return
fi

@@ -363,8 +363,7 @@ function run_spell_success() {
create_cache_archive $TMP_INST_LOG $CACHE $CACHE_COMP

report_install
- rm -f $IW_LOG $C_LOG $TMP_INST_LOG $TMP_MD5_LOG "$STAGE_INST_LOG" \
- "$spell_sub_depends" "$spell_rsub_depends" "$spell_depends"
+ rm -f $IW_LOG $C_LOG $TMP_INST_LOG $TMP_MD5_LOG "$STAGE_INST_LOG"
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libdepengine
b/var/lib/sorcery/modules/libdepengine
index ab7f107..6078ee6 100755
--- a/var/lib/sorcery/modules/libdepengine
+++ b/var/lib/sorcery/modules/libdepengine
@@ -43,6 +43,8 @@ function depengine_entry_point() {
local spell_list=$1
local need_cast_list=$2
local spell pending_list spell_status rc
+ local spell_depends spell_sub_depends spell_rsub_depends
+
for spell in $(hash_get_table_fields dep_f_hash); do
dpgn_set_spell_color $spell white
done
@@ -67,6 +69,21 @@ function depengine_entry_point() {
done
pending_list=$(dpgn_get_all_pending_triggers)
done
+
+ if [[ $CAST_PASS == "four" ]]; then
+ # Now clean up uncommitted dependency files.
+ # During cast it is too early, since things can get re-cast via triggers
+ # and then miss the configuration (empty OPTS).
+ # See issue #662 in chiliproject.
+ debug "libdepengine" "Cleanup of all uncommitted files"
+ for spell in $spell_list; do
+ get_uncommitted_depends_file $spell spell_depends
+ get_uncommitted_sub_depends_file $spell spell_sub_depends
+ get_uncommitted_rsub_depends_file $spell spell_rsub_depends
+ rm -f "$spell_sub_depends" "$spell_rsub_depends" "$spell_depends"
+ done
+ fi
+
return 0
}




  • [SM-Commit] GIT changes to stable-1.15 sorcery by Jaka Kranjc (fbfada5bd2de363237e9e247c4c3167cf3e788c9), Jaka Kranjc, 04/22/2015

Archive powered by MHonArc 2.6.24.

Top of Page