- backup-file.c: Add code to recursively search .pc directories.

  Add a "no-op" mode as default, and allow to just unlink files.
- apatch/rpatch: let backup-files search .pc directories instead
  of generating temporary file lists.
- rpatch/pop: unlink files of topmost patch after popping instead
  of unlinking at each step.
- If QUILTRC is set in the environment, use this as the
  configuration file.

1 files changed, 4 insertions, 7 deletions

diff --git a/scripts/apatch.in b/scripts/apatch.in
index 94c74b4..38235cc 100755
--- a/scripts/apatch.in
+++ b/scripts/apatch.in
@@ -62,17 +62,14 @@ apply_patch()
 
 rollback_patch()
 {
-	local patch=$1 pc_file=$(gen_tempfile)
+	local patch=$1
 
-	# FIXME backup_files should scan the directory hierarchy itself.
-	files_in_patch $patch > $pc_file
-	@LIB@/backup-files $silent_unless_verbose \
-		-f $pc_file -B $QUILT_PC/$patch/ -r
 	if [ -z "$opt_leave_rejects" ]
 	then
-		@SED@ -e 's/$/\.rej/' $pc_file | xargs rm -f
+		files_in_patch | @SED@ -e 's/$/\.rej/' | xargs rm -f
 	fi
-	rm -f $pc_file
+
+	@LIB@/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ -
 }
 
 apatch()