[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.2-28-g352f08a

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 352f08a2084ed960940abf22e2f689a53f7b32c8
Author: Sandro Tosi <morph at debian.org>
Date:   Thu May 21 13:22:29 2009 +0200

    added debsums output also for --template (non interactive) executions

diff --git a/bin/reportbug b/bin/reportbug
index 48e69f9..ea56596 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1300,13 +1300,13 @@ class UI(object):
             reportwith = [x for x in reportwith if x != package]
 
         if (pkgavail and self.options.verify and os.path.exists('/usr/bin/debsums')
-            and not (notatty or self.options.kudos) and state == 'installed'):
+            and not self.options.kudos and state == 'installed'):
             ewrite('Verifying package integrity...\n')
             rc, output = commands.getstatusoutput('/usr/bin/debsums -s'+
                                                   commands.mkarg(package))
             debsumsoutput = output
 
-            if rc:
+            if rc and not notatty:
                 if not ui.yes_no(
                     'There may be a problem with your installation of '+package+
                     ';\nthe following files appear to be missing or changed:\n'+
diff --git a/debian/changelog b/debian/changelog
index f2ffc1e..9626a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,8 +38,9 @@ reportbug (4.3) UNRELEASED; urgency=low
   * bin/reportbug, reportbug/{bugreport.py, utils.py}
     - include debsums output into bug report; thanks to Michael Biebl for the
       report and to Carl Chenet for the patch; Closes: #458572
+    - added debsums output also for --template (non interactive) executions
 
- -- Sandro Tosi <morph at debian.org>  Wed, 20 May 2009 14:08:06 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 21 May 2009 13:21:56 +0200
 
 reportbug (4.2) unstable; urgency=low
 
diff --git a/reportbug/bugreport.py b/reportbug/bugreport.py
index b503e95..40968e3 100644
--- a/reportbug/bugreport.py
+++ b/reportbug/bugreport.py
@@ -168,7 +168,7 @@ class bugreport(object):
 
         # add debsums output to the bug report
         if self.debsumsoutput:
-            report += u"\n%s\n" % self.debsumsoutput
+            report += u"\n-- debsums errors found:\n%s\n" % self.debsumsoutput
 
         return report
 

-- 
Reportbug - reports bugs in the Debian distribution