backportpackage: Use Ubuntu and Debian as fall back check in codename_to_distribution to allow backporting to Ubuntu from a Debian system (LP: #823832).

This commit is contained in:
Benjamin Drung 2011-09-08 18:21:57 +02:00
parent ba6bd9186b
commit e591ab20cf
2 changed files with 6 additions and 4 deletions

8
debian/changelog vendored
View File

@ -2,10 +2,12 @@ ubuntu-dev-tools (0.130) UNRELEASED; urgency=low
* pull-lp-source: Support source packages with a bad version string * pull-lp-source: Support source packages with a bad version string
(LP: #844682). (LP: #844682).
* backportpackage: Search for newer versions in -{updates,security} on Ubuntu * backportpackage:
(LP: #823833). - Search for newer versions in -{updates,security} on Ubuntu (LP: #823833).
- Use Ubuntu and Debian as fall back check in codename_to_distribution to
allow backporting to Ubuntu from a Debian system (LP: #823832).
-- Benjamin Drung <bdrung@debian.org> Thu, 08 Sep 2011 17:25:21 +0200 -- Benjamin Drung <bdrung@debian.org> Thu, 08 Sep 2011 18:10:57 +0200
ubuntu-dev-tools (0.129) unstable; urgency=low ubuntu-dev-tools (0.129) unstable; urgency=low

View File

@ -172,7 +172,7 @@ def codename_to_distribution(codename):
(i.e. looking at the current distribution and its parents), or (i.e. looking at the current distribution and its parents), or
print an error message and return None if it can't be found print an error message and return None if it can't be found
""" """
for distro in system_distribution_chain(): for distro in system_distribution_chain() + ["Ubuntu", "Debian"]:
info = vendor_to_distroinfo(distro) info = vendor_to_distroinfo(distro)
if not info: if not info:
continue continue