From 07451d8631b336694976f167d98136553ba8fc62 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Mon, 8 Feb 2010 11:55:58 -0800 Subject: [PATCH] requestsync: add -C to allow manually adding changelog when missing (LP: #518574). --- debian/changelog | 3 ++- requestsync | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f27f86..2a48220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,8 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low for armel. [ 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 Mon, 08 Feb 2010 10:12:23 -0800 diff --git a/requestsync b/requestsync index a5f44f8..355d434 100755 --- a/requestsync +++ b/requestsync @@ -198,7 +198,7 @@ if __name__ == '__main__': changelog = getDebianChangelog(debian_srcpkg, base_version) if not changelog: 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) else: need_interaction = True @@ -206,6 +206,9 @@ if __name__ == '__main__': report += changelog (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 status = 'confirmed'