summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-02-10 13:11:34 +0100
committerJean Delvare <jdelvare@suse.de>2014-02-10 13:11:34 +0100
commit6051b9347f59f761ef744cb7cc813d5eadd86b55 (patch)
treeadcf8080776e0ff0158c1ea5965503d32718d268
parent79233f4a3634d7c80caca82c8de742b14b2ac647 (diff)
downloadquilt-6051b9347f59f761ef744cb7cc813d5eadd86b55.tar.gz
patchfns: Fix "quilt diff -z" on files with spaces in their names
Before this fix, "quilt diff -z" would fail on files with spaces in their names, with the following error message: Failed to copy files to temporary directory
-rw-r--r--quilt.changes6
-rw-r--r--quilt/scripts/patchfns.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index 15181b1..e8b0f66 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Feb 10 13:07:14 CET 2014 - jdelvare@suse.de
+
+- patchfns: Fix "quilt diff -z" on files with spaces in their
+ names.
+
+-------------------------------------------------------------------
Mon Jan 27 10:12:16 CET 2014 - jdelvare@suse.de
- doc/RELEASING: Add step-by-step releasing guide.
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index 8ea9a24..42e8de8 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -893,7 +893,7 @@ apply_patch_temporarily()
local prefix=$QUILT_PC/$patch/
[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
if ! ( cd $workdir && \
- $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s ${@:--} )
+ $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s "${@:--}" )
then
printf $"Failed to copy files to temporary directory\n" >&2
return 1