From f0d22226a9c549fe649662f3a4a1ff2e74bd2d77 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Sun, 14 Jun 2015 13:50:28 -0600 Subject: [PATCH] Allow requestsync/syncpackage to work with either codename or alias --- ubuntutools/requestsync/mail.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ubuntutools/requestsync/mail.py b/ubuntutools/requestsync/mail.py index 1abb395..5523d8a 100644 --- a/ubuntutools/requestsync/mail.py +++ b/ubuntutools/requestsync/mail.py @@ -56,15 +56,18 @@ def _get_srcpkg(distro, name, release): # Canonicalise release: debian_info = DebianDistroInfo() try: - release = debian_info.codename(release, default=release) + codename = debian_info.codename(release, default=release) except DistroDataOutdated as e: Logger.warn(e) - lines = list(rmadison(distro, name, suite=release, arch='source')) + lines = list(rmadison(distro, name, suite=codename, arch='source')) if not lines: - raise PackageNotFoundException("'%s' doesn't appear to exist " - "in %s '%s'" - % (name, distro.capitalize(), release)) + lines = list(rmadison(distro, name, suite=release, arch='source')) + if not lines: + raise PackageNotFoundException("'%s' doesn't appear to exist " + "in %s '%s'" + % (name, distro.capitalize(), + release)) pkg = max(lines, key=lambda x: Version(x['version'])) return FakeSPPH(pkg['source'], pkg['version'], pkg['component'], distro)