[SM-Commit] BZR Change 15 to test sorcery by Andrew Stitt <afrayedknot at thefrayedknot>

bzr at mail.sourcemage.org bzr at mail.sourcemage.org
Fri Apr 21 11:45:06 EDT 2006


------------------------------------------------------------
revno: 15
committer: Andrew Stitt <afrayedknot at thefrayedknot>
branch nick: test
timestamp: Fri 2006-04-21 08:40:27 -0700
message:
  fix bug 11372 and other summon issues

=== modified file 'ChangeLog'
--- ChangeLog	
+++ ChangeLog	
@@ -1,3 +1,8 @@
+2006-04-21 Andrew Stitt <astitt at sourcemage.org>
+	* libsummon: fix bug 11372, bad spells can make us unlock the wrong
+	  resource, causing subsequent summons to hang. Also fix return code
+	  propagation.
+
 2006-04-12 Andrew Stitt <astitt at sourcemage.org>
 	* gaze: fix bug 10144, fix viewing of install queue, patch from
 	  Jaka Kranjc

=== modified file 'var/lib/sorcery/modules/libsummon'
--- var/lib/sorcery/modules/libsummon	
+++ var/lib/sorcery/modules/libsummon	
@@ -49,7 +49,6 @@
       persistent_save
       # save the rc, then unlock
       rc=$?
-      unlock_resources "summon" "${SPELL}"
 
       if [[ $rc == 0 ]]; then
         activity_log "summon" "$SPELL"  "$VERSION" "success"
@@ -59,10 +58,10 @@
 
       # this actually only returns from the subshell, not the function
       return $rc
-    ) &&
-    popd &>/dev/null
+    ) && popd &>/dev/null
+    rc=$?
     rm -rf $dl_dir
-    rc=$?
+    unlock_resources "summon" "${SPELL}"
   fi
   return $rc
 }




More information about the SM-Commit mailing list