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

Jaka Kranjc scm at sourcemage.org
Sat Jan 3 09:11:42 EST 2009


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

 usr/bin/quill                      |    2 +-
 var/lib/quill/ChangeLog            |    5 +++++
 var/lib/quill/modules/libpre_build |    2 ++
 var/lib/quill/version              |    2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

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

    	* libpre_build: also try removing patches specified in multiple lines
    	* quill: fixed a SIGINT trap thinko

diff --git a/usr/bin/quill b/usr/bin/quill
index 6b56980..2e9904e 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -184,7 +184,7 @@ then
         [[ $UPDATE_COUNTER == 0 ]] && continue # there were no updates
 
         # check if WEB_SITE is reachable
-        trap INT break
+        trap break INT
         WEB_SITE=$(. DETAILS &> /dev/null; echo $WEB_SITE)
         while ! url_verify "$WEB_SITE" > /dev/null; do
           error_msg "The website is not reachable: $WEB_SITE"
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index ed20ff9..19f11f6 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,4 +1,9 @@
 2009-01-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libpre_build: also try removing patches specified in multiple lines
+	* quill: fixed a SIGINT trap thinko
+	* version: 0.3.0-rc12
+
+2009-01-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libupdate, quill: tell the user they can ^C out of the url checks
 	* quill: loop on the website check; support --help; allow starting
 	  quill without any arguments in normal mode
diff --git a/var/lib/quill/modules/libpre_build b/var/lib/quill/modules/libpre_build
index 2b2ae93..ff93996 100644
--- a/var/lib/quill/modules/libpre_build
+++ b/var/lib/quill/modules/libpre_build
@@ -102,6 +102,8 @@ function pre_build_menu() {
       # remove it
       rm $patch
       sed -i "/patch.*$patch/d" PRE_BUILD
+      # try to also remove two-line entries
+      sed -i "/^\s*patch/ {N; /patch.*$patch/d}" PRE_BUILD
 
       # run the whole pre_build
       if ! test_pre_build; then
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 55f9a98..b331c0e 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.3.0-rc11
+0.3.0-rc12



More information about the SM-Commit mailing list