Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] BZR Change 21 to devel sorcery by Andrew Stitt <astitt@sourcemage.org>

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: bzr AT mail.sourcemage.org
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] BZR Change 21 to devel sorcery by Andrew Stitt <astitt AT sourcemage.org>
  • Date: Fri, 21 Apr 2006 10:35:03 -0500

------------------------------------------------------------
revno: 21
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Fri 2006-04-21 08:31:15 -0700
message:
fix bug 11372, and some 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-14 Andrew Stitt <astitt AT sourcemage.org>
* libmisc: add forkless basename and dirname functions using
bash variable expansions.

=== 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
}




  • [SM-Commit] BZR Change 21 to devel sorcery by Andrew Stitt <astitt AT sourcemage.org>, bzr, 04/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page