[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-33-g870118d

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 3a02e3556de1bde6037af7818b5bdbc3b5dd71ef
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Jan 6 15:36:42 2010 +0100

    in case the package bug script exited with a non-0 return code, reportbug now asks if still reporting or stop; thanks to martin f krafft for the report; Closes: #382010

diff --git a/bin/reportbug b/bin/reportbug
index d489c23..741b7f6 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1884,9 +1884,17 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
 
             fh, filename = TempFile(prefix=tfprefix, dir=self.options.draftpath)
             fh.close()
-            ui.system('LC_ALL=C %s %s %s' % (handler, commands.mkarg(bugexec),
+            rc = ui.system('LC_ALL=C %s %s %s' % (handler, commands.mkarg(bugexec),
                                              commands.mkarg(filename)))
 
+            if rc and not notatty:
+                if not ui.yes_no(
+                    'The package bug script %s exited with an error status (return '
+                    'code = %s). Do you still want to file a report?' % (bugexec,rc),
+                    'Ignore this problem and continue.',
+                    'Exit without filing a report.', False, nowrap=True):
+                    efail("Package bug script failed; stopping.\n")
+
             addinfo = None
             if not self.options.noconf:
                 fp = open(filename)
diff --git a/debian/changelog b/debian/changelog
index f5d0366..83139af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ reportbug (4.10~WIP) UNRELEASED; urgency=low
       A. de Oliveira for the report; Closes: #405093
     - don't present configuration if using '-f' cli option; thanks to Ross
       Boylan for the report and to Carl Chenet for the patch; Closes: #372250
+    - in case the package bug script exited with a non-0 return code, reportbug
+      now asks if still reporting or stop; thanks to martin f krafft for the
+      report; Closes: #382010
   * man/reportbug.conf.5
     - clarified the configuration files has to be UTF-8 documents; thanks to
       Anders Lageras for the report; Closes: #417054
@@ -68,7 +71,7 @@ reportbug (4.10~WIP) UNRELEASED; urgency=low
       where to save report drafts; thanks to Kokushoku Karasu for the report and
       to Carl Chenet for the (partial) patch; Closes: #309273
 
- -- Sandro Tosi <morph at debian.org>  Wed, 06 Jan 2010 00:45:03 +0100
+ -- Sandro Tosi <morph at debian.org>  Wed, 06 Jan 2010 15:35:45 +0100
 
 reportbug (4.9) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution