Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (87320d7be71af96fbd6d891b1dc9d0a99df1826a)

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 test-1.14 sorcery by Jaka Kranjc (87320d7be71af96fbd6d891b1dc9d0a99df1826a)
  • Date: Fri, 8 Aug 2008 08:00:03 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +++
etc/sorcery/version | 2 +-
usr/sbin/sorcery | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 87320d7be71af96fbd6d891b1dc9d0a99df1826a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.14.1-rc5

commit baebd1fb5f7640cb542224114a376ae97e4334ed
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

sorcery: properly check for empty files in *_execute()

(cherry-picked from commit 86bb610f44fc5d65705a946dd3439067e0fe61f4)

diff --git a/ChangeLog b/ChangeLog
index a62532e..d0358b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-07-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sorcery: properly check for empty files in *_execute()
+
2008-08-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtablet: fixed a coalescing regression #14618
follow symbolic links when searching for the grimoire
diff --git a/etc/sorcery/version b/etc/sorcery/version
index f0a38fa..5beff0d 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc4
+1.14.1-rc5
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 3cbb914..ab499c5 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1731,7 +1731,7 @@ background_execute() {

eval "$DIALOG --msgbox \"Processing queues in the background.\" 0 0"

- [ -f $REMOVE_QUEUE ] &&
+ [[ -s $REMOVE_QUEUE ]] &&
dispel `cat $REMOVE_QUEUE` 1>/dev/null 2>&1
rm -f $REMOVE_QUEUE

@@ -1749,7 +1749,7 @@ background_execute() {

foreground_execute() {

- [ -f $REMOVE_QUEUE ] &&
+ [[ -s $REMOVE_QUEUE ]] &&
dispel `cat $REMOVE_QUEUE`
rm -f $REMOVE_QUEUE




  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (87320d7be71af96fbd6d891b1dc9d0a99df1826a), Jaka Kranjc, 08/08/2008

Archive powered by MHonArc 2.6.24.

Top of Page