diff --git a/debian/changelog b/debian/changelog index da6bb8e..3f27f86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,10 @@ ubuntu-dev-tools (0.93) UNRELEASED; urgency=low * Demote qemu-kvm-extras-static to a Suggests since most people don't build for armel. - -- Emmet Hikory Fri, 05 Feb 2010 16:45:26 -0800 + [ Kees Cook ] + * requestsync: add -C to allow manually adding changelog when missing. + + -- Kees Cook Mon, 08 Feb 2010 10:12:23 -0800 ubuntu-dev-tools (0.92) lucid; urgency=low diff --git a/requestsync b/requestsync index b2f7f2a..a5f44f8 100755 --- a/requestsync +++ b/requestsync @@ -61,6 +61,9 @@ if __name__ == '__main__': optParser.add_option('-s', action = 'store_true', dest = 'sponsorship', default = False, help = 'Force sponsorship') + optParser.add_option('-C', action = 'store_true', + dest = 'missing_changelog_ok', default = False, + help = 'Allow changelog to be manually filled in when missing') optParser.add_option('-e', action = 'store_true', dest = 'ffe', default = False, help = 'Use this after FeatureFreeze for non-bug fix syncs, changes ' \ @@ -194,8 +197,12 @@ if __name__ == '__main__': report += 'Changelog entries since current %s version %s:\n\n' % (release, ubuntu_version) changelog = getDebianChangelog(debian_srcpkg, base_version) if not changelog: - print >> sys.stderr, "E: Did not retrieve any changelog entries. Was the package recently uploaded? (check http://packages.debian.org/changelogs/)" - sys.exit(1) + 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/)" + sys.exit(1) + else: + need_interaction = True + changelog = "XXX FIXME: add changelog here XXX" report += changelog (title, report) = edit_report(title, report, changes_required = need_interaction)