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

[Francesco Poli (t1000)]

The following commit has been merged in the master branch:
commit 44779f9a5636d8143ed882e39472d7240dc22b3e
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Thu Sep 30 00:01:42 2010 +0200

    flip questions for network downs (Closes: #598076)

diff --git a/debian/changelog b/debian/changelog
index 8caf8d0..d573aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,12 +20,16 @@ apt-listbugs (0.1.4) UNRELEASED; urgency=low
   * added minimal handling of errors encountered when reading package fields
   * bumped Standards-Version to 3.9.1: no changes needed
   * enhanced stylistic consistency in questions to user
+  * fixed "please enhance safety in case of network problems, when stdout
+    is not a terminal": do not ask if the user wants to abort in case of
+    network problems, ask if the user wants to continue anyway, instead
+    (Closes: #598076)
 
   [ 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>  Tue, 28 Sep 2010 22:15:39 +0200
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Tue, 28 Sep 2010 22:29:58 +0200
 
 apt-listbugs (0.1.3) unstable; urgency=low
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 5ebed5d..c2f378f 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -868,7 +868,7 @@ module Factory
         $stderr.puts _(" E: HTTP GET failed")
         retrycount -= 1
         retry if config.frontend.yes_or_no?(_("Retry downloading bug information?")) && retrycount > 0
-        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation?"))
+        raise _("Exiting with error") if ! config.frontend.yes_or_no?(_("Continue the installation anyway?"), false)
         bugs = []
       rescue SOAP::EmptyResponseError => exception
         config.frontend.puts _(" Fail")
@@ -876,7 +876,7 @@ module Factory
         $stderr.puts _(" E: Empty stream from SOAP")
         retrycount -= 1
         retry if config.frontend.yes_or_no?(_("Retry downloading bug information?")) && retrycount > 0
-        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation?"))
+        raise _("Exiting with error") if ! config.frontend.yes_or_no?(_("Continue the installation anyway?"), false)
         bugs = []
       rescue Exception => exception
         config.frontend.puts _(" Fail")
@@ -890,7 +890,7 @@ module Factory
         end
         retrycount -= 1
         retry if config.frontend.yes_or_no?(_("Retry downloading bug information?")) && retrycount > 0
-        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation?"))
+        raise _("Exiting with error") if ! config.frontend.yes_or_no?(_("Continue the installation anyway?"), false)
         bugs = []
       end
       yield _("Retrieving bug reports..."), "100%"

-- 
apt-listbugs development tree