diff --git a/backportpackage b/backportpackage index 34cd301..9e94e6d 100755 --- a/backportpackage +++ b/backportpackage @@ -29,6 +29,7 @@ from urllib.parse import quote import lsb_release from httplib2 import Http, HttpLib2Error +from distro_info import DebianDistroInfo from ubuntutools.archive import (DebianSourcePackage, UbuntuSourcePackage, DownloadError) @@ -225,10 +226,19 @@ def get_backport_version(version, suffix, upload, release): distribution = codename_to_distribution(release) if not distribution: error('Unknown release codename %s' % release) - series = Distribution(distribution.lower()).\ - getSeries(name_or_version=release) + if distribution == 'Debian': + supported = DebianDistroInfo().supported() + if release not in supported: + error('%s is not supported (%s)' % (release, supported)) + release_version = DebianDistroInfo.version(release) + backport_version = version + '~bpo%s+1' % release_version + elif distribution == 'Ubuntu': + series = Distribution(distribution.lower()).\ + getSeries(name_or_version=release) - backport_version = version + ('~%s%s.1' % (distribution.lower(), series.version)) + backport_version = version + ('~%s%s.1' % (distribution.lower(), series.version)) + else: + error('Unknown distribution «%s» for release «%s»' % (distribution, release)) if suffix is not None: backport_version += suffix elif upload and upload.startswith('ppa:'): diff --git a/debian/changelog b/debian/changelog index 4ac2b9b..c43d765 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ubuntu-dev-tools (0.187) UNRELEASED; urgency=medium * mk-sbuild: + Apply patch from Peter Pentchev to avoid a broken log message. Closes: #968316 + * backportpackage: + + Support backporting to Debian releases. LP: #974132 -- Mattia Rizzolo Sun, 31 Oct 2021 16:24:56 +0100