sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (9007fff7487e5dab46f95e9bf80ede7626756a35)
- 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 (9007fff7487e5dab46f95e9bf80ede7626756a35)
- Date: Mon, 21 Jan 2008 14:29:57 -0600
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 1 +
var/lib/sorcery/modules/liblock | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9007fff7487e5dab46f95e9bf80ede7626756a35
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
don't quit when removing the old lock list
wierd stuff, seems like the grep was failing before
diff --git a/ChangeLog b/ChangeLog
index a044f74..53f8b98 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
+ don't quit when removing the old lock list
* libdepends: fixed a regression introduced in 2008-01-16
2008-01-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
diff --git a/var/lib/sorcery/modules/liblock b/var/lib/sorcery/modules/liblock
index f4fc5e0..63c97b4 100755
--- a/var/lib/sorcery/modules/liblock
+++ b/var/lib/sorcery/modules/liblock
@@ -320,8 +320,10 @@ function lock_commit_transaction()
fi
fi
grep -v ".*:$i:$$" $LOCK_TRANSACTIONS.new >$LOCK_TRANSACTIONS &&
- { rm $LOCK_TRANSACTIONS.new ||
- message "${PROBLEM_COLOR}Very odd case. Quitting."; exit 1; }
+ if ! rm $LOCK_TRANSACTIONS.new; then
+ message "${PROBLEM_COLOR}Very odd case. Quitting."
+ exit 1
+ fi
done
unlock_file $LOCK_TRANSACTIONS
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (9007fff7487e5dab46f95e9bf80ede7626756a35), Jaka Kranjc, 01/21/2008
Archive powered by MHonArc 2.6.24.