[Apt-listbugs-commits] [apt-listbugs] 02/02: drop redundant exit 10 in 10apt-listbugs

[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 24831f84593251b3afb432827c4599bc98e67ed2
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Fri Aug 9 18:07:46 2013 +0200

    drop redundant exit 10 in 10apt-listbugs
    
    apt-listbugs own exit codes should be enough to stop apt
---
 10apt-listbugs       |    2 +-
 debian/README.Debian |   10 +++++-----
 debian/changelog     |    2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/10apt-listbugs b/10apt-listbugs
index 3deba20..c4ac26b 100644
--- a/10apt-listbugs
+++ b/10apt-listbugs
@@ -1,6 +1,6 @@
 // Before installing packages, check whether they have release-critical bugs.
 // If you don't like it, comment it out.
-DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt || exit 10";};
+DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt";};
 DPkg::Tools::Options::/usr/sbin/apt-listbugs "";
 DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
 // AptListbugs::IgnoreRegexp "FTBFS";
diff --git a/debian/README.Debian b/debian/README.Debian
index 441ba2d..1680496 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -140,15 +140,15 @@ without stopping the installation/upgrade process, you can obtain this
 behavior by editing /etc/apt/apt.conf.d/10apt-listbugs to add the "yes"
 option "-y": the following line
 
-    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt || exit 10";};
+    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt";};
 
 should become
 
-    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs -y apt || exit 10";};
+    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs -y apt";};
 
 Please note that this configuration could even be made conditional:
 
-    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs $APT_LISTBUGS_OPTS apt || exit 10";};
+    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs $APT_LISTBUGS_OPTS apt";};
 
 This way, apt-listbugs will avoid stopping the installation/upgrade
 process *only* if an APT_LISTBUGS_OPTS environment variable is set to "-y".
@@ -247,11 +247,11 @@ an apt session), you may enable debug output by editing
 /etc/apt/apt.conf.d/10apt-listbugs to add the debug option "-d":
 the following line
 
-    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt || exit 10";};
+    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt";};
 
 should become
 
-    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt -d || exit 10";};
+    DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt -d";};
 
 Then please restart the apt session, and attach the output along with
 your bug report.
diff --git a/debian/changelog b/debian/changelog
index 83a6e32..5881d2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ apt-listbugs (0.1.10) UNRELEASED; urgency=low
   * adopted UTF-8 arrows, when charset is UTF-8
   * adopted standard Ruby library Tempfile for HTML bug lists too, thus
     dropping the ad-hoc HtmlTempfile
+  * improved 10apt-listbugs configuration file (enhanced English in a comment,
+    dropped redundant exit 10)
 
  -- Francesco Poli (wintermute) <invernomuto at paranoici.org>  Sat, 29 Jun 2013 17:18:26 +0200
 

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