Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-04-18 13:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

submittodebian: if the package is in bzr, look for bzr metadata first

Browse Source 
before looking for a previous package revision in the parent dir.
This commit is contained in:
Steve Langasek 2009-12-11 13:46:28 -08:00
parent 5343d2348f
commit 2fed60d3c4
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,6 +1,8 @@
ubuntu-dev-tools (0.84ubuntu1) UNRELEASED; urgency=low
ubuntu-dev-tools (0.85) UNRELEASED; urgency=low
* submittodebian: switch to use lucid as the default distro tag.
* submittodebian: if the package is in bzr, look for bzr metadata first
before looking for a previous package revision in the parent dir.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 11 Dec 2009 13:28:24 -0800

40
submittodebian
View File

@ -2,8 +2,9 @@
# -*- coding: utf-8 -*-
#
# submittodebian - tool to submit patches to Debian's BTS
# Copyright (C) 2007 Canonical Ltd.
# Author: Soren Hansen <soren@ubuntu.com>
# Copyright (C) 2007, 2009 Canonical Ltd.
# Author: Soren Hansen <soren@ubuntu.com>,
# Steve Langasek <slangasek@canonical.com>
#
# ##################################################################
#
@ -51,22 +52,31 @@ def gen_debdiff(changelog):
oldver = changelog._blocks[1].version
newver = changelog._blocks[0].version
if oldver.epoch is not None:
oldver = str(oldver)[str(oldver).index(":")+1:]
if newver.epoch is not None:
newver = str(newver)[str(newver).index(":")+1:]
try:
print "Extracting bzr diff between %s and %s" % (oldver, newver)
(fd, debdiff) = mkstemp()
os.close(fd)
cmd = 'bzr diff -r tag:%s | filterdiff -x "*changelog*" > %s' % (oldver, debdiff)
run_cmd(cmd)
olddsc = '../%s_%s.dsc' % (pkg, oldver)
newdsc = '../%s_%s.dsc' % (pkg, newver)
except:
os.unlink(debdiff)
if oldver.epoch is not None:
oldver = str(oldver)[str(oldver).index(":")+1:]
if newver.epoch is not None:
newver = str(newver)[str(newver).index(":")+1:]
check_file(olddsc)
check_file(newdsc)
olddsc = '../%s_%s.dsc' % (pkg, oldver)
newdsc = '../%s_%s.dsc' % (pkg, newver)
print "Generating debdiff between %s and %s" % (oldver, newver)
(fd, debdiff) = mkstemp()
os.close(fd)
cmd = 'debdiff %s %s | filterdiff -x "*changelog*" > %s' % (olddsc, newdsc, debdiff)
run_cmd(cmd)
check_file(olddsc)
check_file(newdsc)
print "Generating debdiff between %s and %s" % (oldver, newver)
(fd, debdiff) = mkstemp()
os.close(fd)
cmd = 'debdiff %s %s | filterdiff -x "*changelog*" > %s' % (olddsc, newdsc, debdiff)
run_cmd(cmd)
return debdiff