merged lp:~smoser/ubuntu-dev-tools/lp1508948-rmadison-sid-is-unstable

debian/changelog

@@ -14,6 +14,14 @@ ubuntu-dev-tools (0.155) UNRELEASED; urgency=medium
   * mk-sbuild, pull-debian-{debdiff,source}: Use httpredir.debian.org as the
     default mirror for Debian.
 
+  [ Scott Moser ]
+  * ubuntutools/archive.py/rmadison: return results for sid if asked about
+    unstable.
+    Some versions of rmadison return results with 'unstable' when asked 
+    about sid. Others return 'sid'. This makes a query of 'unstable' return 
+    results for sid.
+    End result is fixing 'pull-debian-source hello' on wily.
+
  -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>  Mon, 19 Jan 2015 14:15:32 +0000
 
 ubuntu-dev-tools (0.154) experimental; urgency=medium

ubuntutools/archive.py

@@ -636,7 +636,11 @@ def rmadison(url, package, suite=None, arch=None):
         # 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: