mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-13 08:01:09 +00:00
ubuntutools.archive.rmadison: suite can be None, handle this correctly.
This commit is contained in:
parent
de373f2ddc
commit
5bb84b1548
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,8 +1,12 @@
|
|||||||
ubuntu-dev-tools (0.121) UNRELEASED; urgency=low
|
ubuntu-dev-tools (0.121) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
[ Daniel Holbach ]
|
||||||
* harvest, setup.py: install tool that queries Harvest for information
|
* harvest, setup.py: install tool that queries Harvest for information
|
||||||
about open opportunities for a given source package.
|
about open opportunities for a given source package.
|
||||||
|
|
||||||
|
[ Stefano Rivera ]
|
||||||
|
* ubuntutools.archive.rmadison: suite can be None, handle this correctly.
|
||||||
|
|
||||||
-- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 21 Mar 2011 12:24:56 +0100
|
-- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 21 Mar 2011 12:24:56 +0100
|
||||||
|
|
||||||
ubuntu-dev-tools (0.120) unstable; urgency=low
|
ubuntu-dev-tools (0.120) unstable; urgency=low
|
||||||
|
@ -522,7 +522,8 @@ def rmadison(url, package, suite=None, arch=None):
|
|||||||
assert process.wait() == 0
|
assert process.wait() == 0
|
||||||
|
|
||||||
# rmadison uses some shorthand
|
# rmadison uses some shorthand
|
||||||
suite = suite.replace('-proposed-updates', '-p-u')
|
if suite:
|
||||||
|
suite = suite.replace('-proposed-updates', '-p-u')
|
||||||
|
|
||||||
for line in output.strip().splitlines():
|
for line in output.strip().splitlines():
|
||||||
pkg, ver, dist, archs = [x.strip() for x in line.split('|')]
|
pkg, ver, dist, archs = [x.strip() for x in line.split('|')]
|
||||||
@ -534,7 +535,7 @@ def rmadison(url, package, suite=None, arch=None):
|
|||||||
# rmadison returns some results outside the requested set.
|
# rmadison returns some results outside the requested set.
|
||||||
# It'll include backports, and when given an unknown suite,
|
# It'll include backports, and when given an unknown suite,
|
||||||
# it ignores that argument
|
# it ignores that argument
|
||||||
if dist != suite:
|
if suite and dist != suite:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if 'source' in archs:
|
if 'source' in archs:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user