* requestsync:

- Guard some calls when -n is specified
  - Fetch changelog of specified version, not current version. If an
    experimenal upload happened after the unstable one we're syncing, this
    is considered to be current by p.d.o and we would get those changelog
    entries in the sync request
  - Remove trailing fullstop from sync bug title
This commit is contained in:
Iain Lane 2009-08-17 12:02:35 +01:00
parent 9842049f21
commit d9dd366665
2 changed files with 14 additions and 6 deletions

11
debian/changelog vendored
View File

@ -16,7 +16,13 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
* buildd: Add a --batch mode for batch retrying/rescoring of packages. * buildd: Add a --batch mode for batch retrying/rescoring of packages.
[ Iain Lane ] [ Iain Lane ]
* requestsync: Guard some calls when -n is specified * requestsync:
- Guard some calls when -n is specified
- Fetch changelog of specified version, not current version. If an
experimenal upload happened after the unstable one we're syncing, this
is considered to be current by p.d.o and we would get those changelog
entries in the sync request
- Remove trailing fullstop from sync bug title
* suspicious-source: Add *.hs *.el *.css to whitelist * suspicious-source: Add *.hs *.el *.css to whitelist
[ Siegfried-Angel Gevatter Pujals ] [ Siegfried-Angel Gevatter Pujals ]
@ -26,7 +32,8 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
directory, pass it to pbuilder as --aptconfdir. Thanks to Paul Novotny directory, pass it to pbuilder as --aptconfdir. Thanks to Paul Novotny
and Ryan Pavlik (LP: #363043). and Ryan Pavlik (LP: #363043).
-- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sun, 16 Aug 2009 00:11:09 +0200
-- Iain Lane <laney@ubuntu.com> Mon, 17 Aug 2009 12:00:33 +0100
ubuntu-dev-tools (0.75) karmic; urgency=low ubuntu-dev-tools (0.75) karmic; urgency=low

View File

@ -144,7 +144,7 @@ def cur_deb_version(sourcepkg, distro):
return out.split('|')[1].rstrip('[]''').strip() return out.split('|')[1].rstrip('[]''').strip()
def debian_changelog(sourcepkg, component, version): def debian_changelog(sourcepkg, component, version, debver):
'''Return the Debian changelog from the latest up to the given version '''Return the Debian changelog from the latest up to the given version
(exclusive).''' (exclusive).'''
@ -158,7 +158,8 @@ def debian_changelog(sourcepkg, component, version):
# Get the debian/changelog file from packages.debian.org. # Get the debian/changelog file from packages.debian.org.
try: try:
debianChangelogPage = urllib2.urlopen('http://packages.debian.org/changelogs/pool/%s/%s/%s/current/changelog.txt' % (component, subdir, sourcepkg)) pkgurl = 'http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog.txt' % (component, subdir, sourcepkg, sourcepkg, debver)
debianChangelogPage = urllib2.urlopen(pkgurl)
except urllib2.HTTPError, error: except urllib2.HTTPError, error:
print >> sys.stderr, "Unable to connect to packages.debian.org. " \ print >> sys.stderr, "Unable to connect to packages.debian.org. " \
"Received a %s." % error.code "Received a %s." % error.code
@ -527,7 +528,7 @@ if __name__ == '__main__':
subscribe = 'motu-release' subscribe = 'motu-release'
pkg_to_sync = '%s %s (%s) from Debian %s (%s).' % (srcpkg, deb_version, component, distro, debiancomponent) pkg_to_sync = '%s %s (%s) from Debian %s (%s)' % (srcpkg, deb_version, component, distro, debiancomponent)
title = "Sync %s" % pkg_to_sync title = "Sync %s" % pkg_to_sync
if ffe == True: if ffe == True:
title = "FFe: " + title title = "FFe: " + title
@ -571,7 +572,7 @@ if __name__ == '__main__':
base_ver = force_base_ver base_ver = force_base_ver
if not newsource: report += 'Changelog since current %s version %s:\n\n' % (release, cur_ver) if not newsource: report += 'Changelog since current %s version %s:\n\n' % (release, cur_ver)
report += debian_changelog(srcpkg, debiancomponent, base_ver) + '\n' report += debian_changelog(srcpkg, debiancomponent, base_ver, deb_version) + '\n'
if need_interaction: if need_interaction:
(title, report) = edit_report(title, report, changes_required=True) (title, report) = edit_report(title, report, changes_required=True)