Merge lp:~smoser/ubuntu-dev-tools/lp1508948-rmadison-sid-is-unstable into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Scott Moser]

[Daniel Holbach (dholbach)]

Thanks.

review: Approve

[Daniel Holbach (dholbach)]

I merged this and added a d/changelog entry for you. Maybe you can coordinate with xnox to get it into Debian and Ubuntu?

=== modified file 'ubuntutools/archive.py'
--- ubuntutools/archive.py	2014-12-18 23:18:00 +0000
+++ ubuntutools/archive.py	2015-10-22 14:03:06 +0000
@@ -636,7 +636,11 @@
         # rmadison returns some results outside the requested set.
         # It'll include backports, and when given an unknown suite,
         # it ignores that argument
-        if suite and dist != suite:
+        #
+        # some versions (2.14.1ubuntu0.1) of rmadison return 'sid' when
+        # asked about 'unstable'.  Others return 'unstable'.  Accept either.
+        if (suite and dist != suite and not 
+                (suite == 'sid' and dist == 'unstable')):
             continue
 
         if 'source' in archs: