From dcad51ec876ec361c90506de9e28577ca79cb3ac Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Fri, 3 Jun 2011 19:18:38 +0200 Subject: [PATCH] sponsor-patch: Use dch --release instead of --edit to work with DEBCHANGE_RELEASE_HEURISTIC=changelog. --- debian/changelog | 2 ++ ubuntutools/sponsor_patch/sponsor_patch.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03be190..a2c102d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ubuntu-dev-tools (0.125) UNRELEASED; urgency=low [ Stefano Rivera ] * ubuntutools.archive: Display any errors rmadison emits, rather than guessing at the cause. (LP: #788447) + * sponsor-patch: Use dch --release instead of --edit to work with + DEBCHANGE_RELEASE_HEURISTIC=changelog. [ Dustin Kirkland ] * doc/lp-project-upload.1, lp-project-upload: diff --git a/ubuntutools/sponsor_patch/sponsor_patch.py b/ubuntutools/sponsor_patch/sponsor_patch.py index 4c5626f..e318a5c 100644 --- a/ubuntutools/sponsor_patch/sponsor_patch.py +++ b/ubuntutools/sponsor_patch/sponsor_patch.py @@ -332,7 +332,7 @@ def sponsor_patch(bug_number, build, builder, edit, keyid, lpinstance, update, ask_for_manual_fixing() continue - cmd = ["dch", "--maintmaint", "--edit", ""] + cmd = ["dch", "--maintmaint", "--release", ""] Logger.command(cmd) if subprocess.call(cmd) != 0: Logger.info("Failed to update timestamp in debian/changelog.")