Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

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

 ChangeLog                                |    5 +++++
 var/lib/sorcery/modules/build_api/common |    5 ++---
 var/lib/sorcery/modules/libdepengine     |   17 +++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 0e0bb7f4baf5b2f865719431b603a02623b7769f
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 7cb61d04aad2ae422c6535d29c9e08ea0e448f4c
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

diff --git a/ChangeLog b/ChangeLog
index c931c91..f973e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
        * gaze: orphans should not ignore runtime dependencies #570
          patch from Remko van der Vossen
diff --git a/var/lib/sorcery/modules/build_api/common 
b/var/lib/sorcery/modules/build_api/common
index 41cfe3c..0c25359 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -312,7 +312,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
 
@@ -365,8 +365,7 @@ function run_spell_success() {
 
     report_install
     run_hook  SUCCESS post
-    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
 }