[SM-Commit] GIT changes to master quill by Jaka Kranjc (c2bdd8597c00271bf194b5b3b7c7c5d03f1644d3)

Jaka Kranjc scm at sourcemage.org
Mon Apr 28 14:05:03 EDT 2008


GIT changes to master quill by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 usr/bin/quill           |   12 +++++++++++-
 var/lib/quill/ChangeLog |    4 ++++
 var/lib/quill/version   |    2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit c2bdd8597c00271bf194b5b3b7c7c5d03f1644d3
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    	* quill: added another sanity check for adding spells
    	* version: 0.2.9-rc13

diff --git a/usr/bin/quill b/usr/bin/quill
index 8584b8e..eaa2b12 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -341,7 +341,7 @@ else # no updates, we'll be making a spell
   query_spell_source_url
   # the semirandom fallback url is there to circumvent sorcery bug #13729
   while ! url_verify "${SPELL_SRC_URL:-ftp://34tqgsad}" > /dev/null; do
-    error_msg "Invalid URL!"
+    error_msg "Invalid URL!\n"
     unset SPELL_SRC_URL
     query_spell_source_url
   done
@@ -411,6 +411,16 @@ else # no updates, we'll be making a spell
   # redo it for QUILL_FETCH_MODE, perhaps it didn't fetch a valid source url
   # first time for other modes
   parse_spell_source_file_info
+  while [[ -z $SPELL_SANITIZED_FILE_NAME ]]; do
+    if [[ -n $SPELL_SRC_FILE ]]; then
+      SPELL_SANITIZED_FILE_NAME=$SPELL_SRC_FILE
+      break
+    fi
+    error_msg "Source file couldn't be found. Check that the url is valid and downloadable!\n"
+    unset SPELL_SRC_URL
+    query_spell_source_url
+    parse_spell_source_file_info
+  done
   show_spell_source_file_info
   echo
 
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 62a2ceb..8040331 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-30 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* quill: added another sanity check for adding spells
+	* version: 0.2.9-rc13
+
 2008-02-02 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libdesktop:use -s with fmt, so it is much less likely for the formatting
 	  to get screwed (think bulleted lists)
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 5a1283a..1949563 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.9-rc12
+0.2.9-rc13



More information about the SM-Commit mailing list