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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit d0723d7aaebc33cb218e67db8c340001a69c2631
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jun 3 18:07:15 2012 +0200

    include arch:all in package versions lookup; thanks to Hilmar Preuße for the report; Closes: #673204
    
    Currently, the search wasn't matching arch:all packages, but only the arch on
    the machine running reportbug. That means that arch:all packages were not
    searched for newer packages nor if the local installation was newer than the one
    on the archive

diff --git a/debian/changelog b/debian/changelog
index 6e15414..ecb4492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ reportbug (6.3.2) UNRELEASED; urgency=low
   * reportbug/checkversions.py
     - match version on the precise architecture, not just check string
       inclusiong; thanks to Nelson de Oliveira for the report; Closes: #650651
+    - include arch:all in package versions lookup; thanks to Hilmar Preuße for
+      the report; Closes: #673204
   * bin/reportbug
     - clarify the menu title when presenting more packages; thanks to Alois
       Mahdal for the report; Closes: #654165
@@ -33,7 +35,7 @@ reportbug (6.3.2) UNRELEASED; urgency=low
     - fix several typos; thanks to Simon Kainz for the report and patch;
       Closes: #669249
 
- -- Sandro Tosi <morph at debian.org>  Tue, 24 Apr 2012 23:59:14 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 03 Jun 2012 18:04:58 +0200
 
 reportbug (6.3.1) unstable; urgency=low
 
diff --git a/reportbug/checkversions.py b/reportbug/checkversions.py
index c3c2907..5f86de3 100644
--- a/reportbug/checkversions.py
+++ b/reportbug/checkversions.py
@@ -130,7 +130,8 @@ def get_versions_available(package, timeout, dists=None, http_proxy=None, arch='
         if dist in dists:
             # select only those lines that refers to source pkg
             # or to binary packages available on the current arch
-            if 'source' in l[3].split(',') or arch in l[3].split(','):
+            if 'source' in l[3].split(',') or arch in l[3].split(',') or \
+                    l[3] == 'all':
                 versions[dist] = l[1]
 
     return versions
diff --git a/test/test_checkversions.py b/test/test_checkversions.py
index 3188a13..17a27d3 100644
--- a/test/test_checkversions.py
+++ b/test/test_checkversions.py
@@ -45,3 +45,10 @@ class TestVersionAvailable(unittest2.TestCase):
         # checking for non-existing package should not generate a traceback
         vers = checkversions.get_versions_available('blablabla', 60)
         self.assertEqual(vers, {})
+
+    @attr('network') #marking the test as using network
+    def test_673204(self):
+        vers = checkversions.get_versions_available('texlive-xetex', 60)
+        # squeeze (stable at this time) is the first suite where texlive-xetex
+        # is arch:all
+        self.assertIn('stable', vers)

-- 
Reportbug - reports bugs in the Debian distribution