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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 85174c0b43e7ddd902f1f5ac48e744e01c66164b
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Aug 3 19:49:56 2010 +0200

    properly catch multiple exceptions; thanks to Jakub Wilk for spotting it

diff --git a/debian/changelog b/debian/changelog
index bd76b6a..f051ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,13 +8,14 @@ reportbug (4.12.5) UNRELEASED; urgency=low
   * reportbug/submit.py
     - fixed a typo: 'receive'/'received'; thanks to Joey Hess for the report;
       Closes: #588198
+    - properly catch multiple exceptions; thanks to Jakub Wilk for spotting it
   * bin/reportbug, man/reportbug.1
     - support globbing when attachments are allowed (so both command-line args
       and sub-menus); thanks to Josh Triplett for the report: Closes: #452648
   * doc/README.Users
     - clarified the usage terms for reportbug.debian.org
 
- -- Sandro Tosi <morph at debian.org>  Sun, 01 Aug 2010 20:02:10 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 03 Aug 2010 19:48:32 +0200
 
 reportbug (4.12.4) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index 1c2f9db..b652f17 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -861,7 +861,7 @@ def mua_exists(mua):
     if os.path.exists(output):
         try:
             returnvalue = subprocess.call(MUAVERSION[mua_tmp], stdout=open(output, 'w'), stderr=subprocess.STDOUT, shell=True)
-        except IOError, OSError:
+        except (IOError, OSError):
             returnvalue = subprocess.call(MUAVERSION[mua_tmp], shell=True)
     else:
         returnvalue = subprocess.call(MUAVERSION[mua_tmp], shell=True)

-- 
Reportbug - reports bugs in the Debian distribution