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

Jaka Kranjc scm at sourcemage.org
Wed Nov 26 13:09:16 EST 2008


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

 var/lib/quill/ChangeLog              |    2 ++
 var/lib/quill/modules/libdeprecation |    2 +-
 var/lib/quill/modules/libpre_build   |    5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

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

          made it more intelligent when downloading files from funny urls
        * libdeprecation: only request removal if there's something to remove

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 16a84b7..dbd43eb 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,5 +1,7 @@
 2008-11-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
     * libpre_build: support for managing PRE_BUILD and patches
+      made it more intelligent when downloading files from funny urls
+    * libdeprecation: only request removal if there's something to remove
     * quill: added PRE_BUILD to the menu
     * version: 0.3.0-rc5
 
diff --git a/var/lib/quill/modules/libdeprecation b/var/lib/quill/modules/libdeprecation
index 981fd21..e89b728 100644
--- a/var/lib/quill/modules/libdeprecation
+++ b/var/lib/quill/modules/libdeprecation
@@ -51,7 +51,7 @@ function deprecate() {
     list_remove remove_list DETAILS DEPENDS HISTORY $overrides TRIGGERS
     message "${MESSAGE_COLOR}AFTER you copy the spell back,$DEFAULT_COLOR"
     message "run this under $QUILL_GIT_DIR:"
-    message "cd $SECTION/$SPELL_NAME; git rm -r -f" $remove_list
+    message "cd $SECTION/$SPELL_NAME; ${remove_list+git rm -r -f $remove_list}"
     message "git add DETAILS DEPENDS HISTORY $overrides TRIGGERS; cd -"
     message
   fi
diff --git a/var/lib/quill/modules/libpre_build b/var/lib/quill/modules/libpre_build
index bf2858c..a0299cc 100644
--- a/var/lib/quill/modules/libpre_build
+++ b/var/lib/quill/modules/libpre_build
@@ -147,8 +147,9 @@ function get_patches()
     until url_verify $_patch; do
       query_string _patch "Enter the patch url: "
     done
-    wget --no-check-certificate $_patch -O $(basename $_patch)
-    _patch=$(basename $_patch)
+    local name=$(basename $_patch | sed 's/\.diff.*/.diff/; s/\.patch.*/.patch/')
+    wget --no-check-certificate $_patch -O $name
+    _patch=$name
   fi
 
   if [[ -z $_patch ]]; then



More information about the SM-Commit mailing list