Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-15 19:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

backportpackage: Pass -v to debuild with last published version

Browse Source 
number. This matches the way backports have traditionally been
generated by archive admins.
This commit is contained in:
Evan Broder 2012-05-13 14:05:53 -07:00
parent 3136efc10d
commit 4ef5a12e60
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backportpackage
View File

@ -217,6 +217,18 @@ def get_backport_version(version, suffix, upload, release):
backport_version += '~ppa1' backport_version += '~ppa1'
return backport_version return backport_version
def get_old_version(source, release):
try:
distribution = codename_to_distribution(release)
archive = Distribution(distribution.lower()).getArchive()
pkg = archive.getSourcePackage(source,
release,
('Release', 'Security', 'Updates',
'Proposed', 'Backports'))
return pkg.getVersion()
except (SeriesNotFoundException, PackageNotFoundException), e:
pass
def get_backport_dist(release, release_pocket): def get_backport_dist(release, release_pocket):
if release_pocket: if release_pocket:
return release return release
@ -289,6 +301,7 @@ def do_backport(workdir, pkg, suffix, close, release, release_pocket, build,
bp_version = get_backport_version(pkg.version.full_version, suffix, bp_version = get_backport_version(pkg.version.full_version, suffix,
upload, release) upload, release)
old_version = get_old_version(pkg.source, release)
bp_dist = get_backport_dist(release, release_pocket) bp_dist = get_backport_dist(release, release_pocket)
changelog = 'No-change backport to %s' % (release,) changelog = 'No-change backport to %s' % (release,)
@ -308,6 +321,8 @@ def do_backport(workdir, pkg, suffix, close, release, release_pocket, build,
cmd.append('-sa') cmd.append('-sa')
else: else:
cmd.append('-sd') cmd.append('-sd')
if old_version:
cmd.append('-v%s' % old_version)
check_call(cmd, cwd=srcdir) check_call(cmd, cwd=srcdir)
fn_base = pkg.source + '_' + bp_version.split(':', 1)[-1] fn_base = pkg.source + '_' + bp_version.split(':', 1)[-1]

5
debian/changelog vendored
View File

@ -28,8 +28,11 @@ ubuntu-dev-tools (0.142) UNRELEASED; urgency=low
* backportpackage: Add -c, --close flag to include a changelog closer. * backportpackage: Add -c, --close flag to include a changelog closer.
* backportpackage: Switch to ~ubuntu12.04.1-style version numbers * backportpackage: Switch to ~ubuntu12.04.1-style version numbers
instead of ~precise1, to make our version numbers more future-proof. instead of ~precise1, to make our version numbers more future-proof.
* backportpackage: Pass -v to debuild with last published version
number. This matches the way backports have traditionally been
generated by archive admins.
-- Evan Broder <evan@ebroder.net> Sun, 13 May 2012 13:49:35 -0700 -- Evan Broder <evan@ebroder.net> Sun, 13 May 2012 13:51:18 -0700
ubuntu-dev-tools (0.141) unstable; urgency=low ubuntu-dev-tools (0.141) unstable; urgency=low