Skip to Content.
Sympa Menu

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

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 (4e6cec6fe5adb19f2c3a4951ac735e3afda8a21c)
  • Date: Mon, 21 Jan 2008 13:40:07 -0600

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

ChangeLog | 1 +
var/lib/sorcery/modules/libdepends | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 4e6cec6fe5adb19f2c3a4951ac735e3afda8a21c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libdepends: fixed a regression introduced in 2008-01-16

diff --git a/ChangeLog b/ChangeLog
index aa1f437..a044f74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2008-01-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* liblock: don't overwrite the lock list in lock_start_transaction
+ * libdepends: fixed a regression introduced in 2008-01-16

2008-01-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* liblock: lock_start_transaction now supports returning by reference
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index da7ea0b..0f3f7cf 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -463,14 +463,14 @@ function private_run_depends()
get_uncommitted_depends_file $SPELL spell_depends
spell_sub_depends=$spell_depends.sub
if [ -n "$RECONFIGURE" ]; then
- local t_spell_p t_abandonded_p
+ local t_abandonded_p
rm -f $DEPENDS_CONFIG/$SPELL
test -f $DEPENDS_CONFIG/$SPELL.p &&
mkdir -p $ABANDONED_PERSIST &&
- lock_start_transaction "$DEPENDS_CONFIG/$SPELL.p" t_spell_p &&
+ lock_file "$DEPENDS_CONFIG/$SPELL.p" &&
lock_start_transaction "$ABANDONED_PERSIST/$SPELL.p" t_abandonded_p &&
- mv -f "$t_spell_p" "$t_abandonded_p" &&
- lock_commit_transaction "$DEPENDS_CONFIG/$SPELL.p" &&
+ mv -f "$DEPENDS_CONFIG/$SPELL.p" "$t_abandonded_p" &&
+ unlock_file "$DEPENDS_CONFIG/$SPELL.p" &&
lock_commit_transaction "$ABANDONED_PERSIST/$SPELL.p"
fi
prepare_spell_config



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (4e6cec6fe5adb19f2c3a4951ac735e3afda8a21c), Jaka Kranjc, 01/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page