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.
This commit is contained in:
Scott Moser 2015-10-22 10:00:21 -04:00
parent a860b7cbaf
commit 12c86a8fda

View File

@ -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: