From 6348bc3df1a688799b685d50c0c955e6976de365 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Sun, 26 Dec 2010 15:16:33 +0100 Subject: [PATCH] Install add-patch link and use it in sponsor-patch. --- debian/links | 1 + ubuntutools/sponsor_patch/main.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/links b/debian/links index 27a79e1..dea75b2 100644 --- a/debian/links +++ b/debian/links @@ -1,2 +1,3 @@ +/usr/bin/edit-patch /usr/bin/add-patch /usr/bin/pbuilder-dist /usr/bin/cowbuilder-dist /usr/share/man/man1/pbuilder-dist.1.gz /usr/share/man/man1/cowbuilder-dist.1.gz diff --git a/ubuntutools/sponsor_patch/main.py b/ubuntutools/sponsor_patch/main.py index c477a27..4a57e0f 100644 --- a/ubuntutools/sponsor_patch/main.py +++ b/ubuntutools/sponsor_patch/main.py @@ -195,9 +195,7 @@ def apply_patch(task, patch): ask_for_manual_fixing() edit = True else: - # FIXME: edit-patch needs a non-interactive mode - # https://launchpad.net/bugs/612566 - cmd = ["edit-patch", patch.full_path] + cmd = ["add-patch", patch.full_path] Logger.command(cmd) if subprocess.call(cmd) != 0: Logger.error("Failed to apply diff %s to %s %s." % \