[Apt-listbugs-commits] [apt-listbugs] 04/04: do not go on when "y" after pinning packages

[Francesco Poli]

This is an automated email from the git hooks/post-receive script.

frx-guest pushed a commit to branch master
in repository apt-listbugs.

commit 4e15e4fee2e1c51e2a4329abd684b0e67fe68001
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Wed Feb 5 23:11:16 2014 +0100

    do not go on when "y" after pinning packages
---
 debian/changelog          | 4 ++++
 lib/apt-listbugs/logic.rb | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 723dbb5..8f3ecef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ apt-listbugs (0.1.13) UNRELEASED; urgency=medium
     in README.Debian
   * added some further considerations to the section about the "affects"
     field in README.Debian
+  * fixed a bug in the handling of the user's answer to the question on
+    how to proceed (continue or stop the installation, or pin packages,
+    and so forth...): a "y" answer is now ignored, when some packages
+    have just been pinned
 
  -- Francesco Poli (wintermute) <invernomuto at paranoici.org>  Sat, 01 Feb 2014 15:43:19 +0100
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index ac493b7..aa7f203 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2002  Masato Taruishi <taru at debian.org>
 # Copyright (C) 2006-2008  Junichi Uekawa <dancer at debian.org>
-# Copyright (C) 2008-2013  Francesco Poli <invernomuto at paranoici.org>
+# Copyright (C) 2008-2014  Francesco Poli <invernomuto at paranoici.org>
 # Copyright (C) 2009-2010  Ryan Niebur <ryan at debian.org>
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -399,7 +399,7 @@ class Viewer
         case answer
 
         when "y"
-          return true
+          return true if hold_pkg_keys.empty?
 
         when "a"
           if hold_pkg_keys.empty?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/apt-listbugs/apt-listbugs.git