[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. 0.1.0-20-g2b90030

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 6ba38d5c5f8a2f3e85cf0fcf6335dc016b3f7383
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Sat Sep 19 00:38:42 2009 +0200

    changed upgrade prompt behavior (Closes: #484408)

diff --git a/debian/TODO b/debian/TODO
index cf6254e..c0db461 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,7 +2,6 @@ Release goals for version 0.1.1
 -------------------------------
 * close #534447 - apt-listbugs: i18n problems
 * close #484385 - does not clean up obsolete cache
-* close #484408 - automatically ignores all bugs
 * close #536613 - apt-listbugs: lists no bugs and returns 0 for non existing packages
 * close #257873 - handle source versions
 
diff --git a/debian/changelog b/debian/changelog
index bc0cda1..5833374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,13 +7,16 @@ apt-listbugs (0.1.1) UNRELEASED; urgency=low
   * documented coexistence with unattended installations/upgrades in
     README.Debian (Closes: #459127)
   * updated --help output and man page
+  * changed behavior when the user is asked whether an installation/upgrade
+    should go on: bugs are no longer automatically made ignored, when the
+    user answers "y"; only when the user answers "a" (Closes: #484408)
 
   [ Ryan Niebur ]
   * updated italian translation, thanks Luca (Closes: #540344)
   * LC_ALL=C when running apt-cache, we parse the English output (Closes:
     #547128)
 
- -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sat, 12 Sep 2009 21:52:52 +0200
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 13 Sep 2009 00:32:15 +0200
 
 apt-listbugs (0.1.0) unstable; urgency=low
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 5ab036b..89f0265 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -333,7 +333,7 @@ class Viewer
 	  if hold_pkgs.empty?
 	    ask_str << " [Y/n/?/...] "
 	  else
-	    ask_str << "[N/?/...] "
+	    ask_str << " [N/?/...] "
 	  end
 	else
 	  ask_str << " [Y/n] "
@@ -355,6 +355,8 @@ class Viewer
 	end
 	case answer
 	when "y"
+	  return true
+	when "a"
 	  if hold_pkgs.empty?
             bugs.each { |bug|
               if ! @config.system_ignore_bugs.include?(bug.bug_number)
@@ -364,7 +366,7 @@ class Viewer
             }
 	    return true
 	  end
-	when  "n"
+	when "n"
 	  return false
 	when /^#?(\d+)$/
 	  if @config.querybts != nil
@@ -436,7 +438,9 @@ class Viewer
 	  end
 	else
 	  if hold_pkgs.empty?
-	    @config.frontend.puts _("     y     - continue the apt installation.\n")
+	    @config.frontend.puts "" +
+              _("     y     - continue the apt installation, but do not make the bugs ignored.\n") +
+              _("     a     - continue the apt installation and make all the above bugs ignored.\n")
 	  end
 	  @config.frontend.puts "" +
 	    _("     n     - stop the apt installation.\n") +
@@ -444,11 +448,11 @@ class Viewer
 	    _("  #<num>   - same as <num>\n") +
 	    _("     r     - redisplay bug lists.\n") +
 	    _(" p <pkg..> - make pkgs pinned: need to restart apt to enable.\n") +
-	    _(" p         - make all the above pkgs pinned. need to restart.\n") +
-	    _(" i <num>   - make bug_number <num> ignored.\n") +
+	    _(" p         - make all the above pkgs pinned: need to restart.\n") +
+	    _(" i <num>   - make bug number <num> ignored.\n") +
 	    _("     ?     - print this help.\n")
 	  if @config.browser != nil
-	    @config.frontend.puts sprintf(_("     w     - display bug lists in html (uses %s).\n"), File.basename(@config.browser))
+	    @config.frontend.puts sprintf(_("     w     - display bug lists in HTML (uses %s).\n"), File.basename(@config.browser))
 	  end
 	end
       end

-- 
apt-listbugs development tree