[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.1-8-g17b75cf

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 17b75cf28b27a693c975bab0428de95a64b76fb1
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Apr 15 20:09:20 2009 +0200

    resolved regression about not being able to select ui from cli, moving the check for attachments existance out of the ui check code. Now all the attachment files are checked for existance and it won't exit at the first missing.

diff --git a/bin/reportbug b/bin/reportbug
index 528ece3..dbc486b 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -817,15 +817,23 @@ def main():
 
     # Load the interface, *before* the configuration step.
     sys.argv = sys.argv[:1] + list(args)
-    if options.interface:
-        interface = options.interface
 
-        iface = '%(interface)s_ui' % vars()
+    # check if attachment files exist, else exiting
+    # all are checked, and it doesn't exit at the first missing
     if options.attachments:
+        any_missing = False
         for attachment in options.attachments:
             if not os.path.exists(os.path.expanduser(attachment)):
-                print 'The file %s does not exist. Exiting.' % attachment
-                sys.exit(1)
+                print 'The attachment file %s does not exist.' % attachment
+                any_missing = True
+        if any_missing:
+            print "The above files are missing, so can't be attached; exiting"
+            sys.exit(1)
+
+    if options.interface:
+        interface = options.interface
+
+        iface = '%(interface)s_ui' % vars()
 
         try:
             lib_package = __import__('reportbug.ui', fromlist=[iface])
diff --git a/debian/changelog b/debian/changelog
index 43ae52c..01ecc0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 reportbug (4.2) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
+  * bin/reportbug
+    - resolved regression about not being able to select ui from cli, moving the
+      check for attachments existance out of the ui check code. Now all the
+      attachment files are checked for existance and it won't exit at the first
+      missing.
+
   [ Luca Bruno ]
   * reportbug/ui/gtk2_ui.py
     - display report message in a dialog at the end, in substitution of pager and stdout
@@ -7,7 +14,7 @@ reportbug (4.2) UNRELEASED; urgency=low
     - respect given order in menus
     - ui focus and layout improvements
 
- -- Sandro Tosi <morph at debian.org>  Mon, 13 Apr 2009 22:43:48 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 15 Apr 2009 20:06:48 +0200
 
 reportbug (4.1) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution