requestsync: add -C to allow manually adding changelog when missing

(LP: #518574).
This commit is contained in:
Kees Cook 2010-02-08 11:55:58 -08:00
parent 233ceb06b9
commit 07451d8631
2 changed files with 6 additions and 2 deletions

3
debian/changelog vendored
View File

@ -8,7 +8,8 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low
for armel. for armel.
[ Kees Cook ] [ Kees Cook ]
* requestsync: add -C to allow manually adding changelog when missing. * requestsync: add -C to allow manually adding changelog when missing
(LP: #518574).
-- Kees Cook <kees@ubuntu.com> Mon, 08 Feb 2010 10:12:23 -0800 -- Kees Cook <kees@ubuntu.com> Mon, 08 Feb 2010 10:12:23 -0800

View File

@ -198,7 +198,7 @@ if __name__ == '__main__':
changelog = getDebianChangelog(debian_srcpkg, base_version) changelog = getDebianChangelog(debian_srcpkg, base_version)
if not changelog: if not changelog:
if not options.missing_changelog_ok: if not options.missing_changelog_ok:
print >> sys.stderr, "E: Did not retrieve any changelog entries. Was the package recently uploaded? (check http://packages.debian.org/changelogs/)" print >> sys.stderr, "E: Did not retrieve any changelog entries. Do you need to specify '-C'? Was the package recently uploaded? (check http://packages.debian.org/changelogs/)"
sys.exit(1) sys.exit(1)
else: else:
need_interaction = True need_interaction = True
@ -206,6 +206,9 @@ if __name__ == '__main__':
report += changelog report += changelog
(title, report) = edit_report(title, report, changes_required = need_interaction) (title, report) = edit_report(title, report, changes_required = need_interaction)
if 'XXX FIXME' in report:
print >> sys.stderr, "E: changelog boilerplate found in report, please manually add changelog when using '-C'"
sys.exit(1)
# bug status and bug subscriber # bug status and bug subscriber
status = 'confirmed' status = 'confirmed'