[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-21-g0f08105

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 0f081057f5097da99b7acdae76e7a012df3fff06
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Aug 18 22:16:28 2011 +0200

    support "Debian Ports" in apt policy info section; thanks to Aurelien Jarno for the report and patch; Closes: #638357

diff --git a/debian/changelog b/debian/changelog
index d5f955e..18b4dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ reportbug (6.2) UNRELEASED; urgency=low
   * reportbug/debbugs.py
     - remove release tags; thanks to Kurt Roeckx for the report and to Julien
       Cristau for the confirmation; Closes: #613716
+  * reportbug/utils.py
+    - support "Debian Ports" in apt policy info section; thanks to Aurelien
+      Jarno for the report and patch; Closes: #638357
 
- -- Sandro Tosi <morph at debian.org>  Thu, 18 Aug 2011 12:42:50 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 18 Aug 2011 22:15:08 +0200
 
 reportbug (6.1) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index 32b377d..a48e5e2 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -677,7 +677,7 @@ def get_debian_release_info():
     dists = []
     output = commands.getoutput('apt-cache policy 2>/dev/null')
     if output:
-        mre = re.compile('\s+(\d+)\s+.*$\s+release\s.*o=(Ubuntu|Debian),a=([^,]+),', re.MULTILINE)
+        mre = re.compile('\s+(\d+)\s+.*$\s+release\s.*o=(Ubuntu|Debian|Debian Ports),a=([^,]+),', re.MULTILINE)
         found = {}
         ## XXX: When Python 2.4 rolls around, rewrite this
         for match in mre.finditer(output):

-- 
Reportbug - reports bugs in the Debian distribution