File quilt-push-f-no-interactive.patch of Package quilt

Overview Repositories Revisions Requests Users Attributes Meta

File quilt-push-f-no-interactive.patch of Package quilt (Revision 7bfd20c65ca3ec3a6e25fcaea3270c11)

Currently displaying revision 7bfd20c65ca3ec3a6e25fcaea3270c11 , Show latest

From: Martin Panter <vadmium@gmail.com>
Date: Wed, 23 Sep 2009 18:20:30 +1000
Subject: Do not use interactive mode with "quilt push -f"
Git-commit: 3a56cb82222266a1e24b5fa8562eb3d1fd6fccd2
Patch-mainline: yes (v0.64)
References: bsc#1042889

The interactive mode was broken long ago, and not forcing the
patch causes unpredictable and confusing behavior.  Now the
"patch -f" option is always used.
---
 quilt/push.in |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- a/quilt/push.in
+++ b/quilt/push.in
@@ -36,8 +36,7 @@ be used.
 
 -q	Quiet operation.
 
--f	Force apply, even if the patch has rejects. Unless in quiet mode,
-	apply the patch interactively: the patch utility may ask questions.
+-f	Force apply, even if the patch has rejects.
 
 -v	Verbose operation.
 
@@ -118,7 +117,7 @@ apply_patch()
 	[ -s "$patch_file" ] || return 0
 
 	set -- patch $QUILT_PATCH_OPTS $(push_patch_args "$patch") \
-		     --backup --prefix="$QUILT_PC/$patch/" \
+		     --backup --prefix="$QUILT_PC/$patch/" -f \
 		     $no_reject_files -E $more_patch_args
 
 	if [ "${patch_file:(-3)}" = ".gz" ]
@@ -363,8 +362,6 @@ stop_at_patch=$(find_unapplied_patch "$s
 
 more_patch_args=
 [ -n "$opt_quiet" ] && more_patch_args="$more_patch_args -s"
-[ -z "$opt_force" -o -n "$opt_quiet" ] &&
-	more_patch_args="$more_patch_args -f"
 if [ -n "$opt_merge" ]
 then
 	more_patch_args="$more_patch_args --merge$opt_merge_arg"

Places

File quilt-push-f-no-interactive.patch of Package quilt (Revision 7bfd20c65ca3ec3a6e25fcaea3270c11)

Places