[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.3-33-ga6fc548

[Francesco Poli (t1000)]

The following commit has been merged in the master branch:
commit a6fc54847113fbf2cbecbfd9eb924abefbab5717
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Sun Nov 28 00:13:48 2010 +0100

    enhance early SIGINT trapping (Closes: #605039)

diff --git a/apt-listbugs b/apt-listbugs
index 3589a1d..2e4b5cb 100755
--- a/apt-listbugs
+++ b/apt-listbugs
@@ -199,7 +199,7 @@ notable configuration options are
 
 * 0 
 
-  Success
+  Success.
 
 * 1
 
@@ -209,6 +209,11 @@ notable configuration options are
 
   To warn APT not to proceed.
 
+* 130 
+
+  When a SIGINT was received (for instance because the user
+  pressed [Ctrl+C]).
+
 == AUTHORS
 
 apt-listbugs was originally written by Masato Taruishi
@@ -228,6 +233,11 @@ apt.conf(5), sensible-browser(1), www-browser(1), querybts(1)
 
 =end
 
+
+# exit gracefully when user presses [Ctrl+C]
+Signal.trap("SIGINT") { $stderr.puts "Interrupted"; exit 130 }
+
+
 if File.expand_path(__FILE__).match(/^\/usr\/s?bin\//)
   $LOAD_PATH.unshift("/usr/share/apt-listbugs")
   $VERSION = `dpkg-query -W -f='${Version}' apt-listbugs`
@@ -259,8 +269,6 @@ end
 
 ## main from here
 
-trap("INT") { $stderr.puts "Interrupted"; exit(0) }
-
 # Drop out as early as possible if this env var is set.
 if ENV["APT_LISTBUGS_FRONTEND"] == "none" 
   exit 0
diff --git a/debian/changelog b/debian/changelog
index e3b7cb0..12072c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,12 +26,14 @@ apt-listbugs (0.1.4) UNRELEASED; urgency=low
     (Closes: #598076)
   * dropped Ryan from the Maintainer field, since he will no longer be
     involved in apt-listbugs maintenance
+  * fixed "scary message on interruption": enhanced SIGINT trapping in
+    early stages of runtime (Closes: #605039)
 
   [ Ryan Niebur ]
   * updated German translation, thanks Thomas Mueller! (Closes: #578305)
   * flush stdin after running the web browser (Closes: #578299)
 
- -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 17 Oct 2010 19:19:11 +0200
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sat, 27 Nov 2010 22:50:27 +0100
 
 apt-listbugs (0.1.3) unstable; urgency=low
 

-- 
apt-listbugs development tree