summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt.changes2
-rw-r--r--scripts/patchfns.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index 0af789d..1fe63fc 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -4,6 +4,8 @@ Tue Jul 13 00:31:38 CEST 2004 - agruen@suse.de
- refresh command: Fix --diffstat option; it did swap lines. Also
remove stray dollar sign.
- Also set TEXTDOMAINDIR in the wrapper script (bin/quilt.in).
+- Fix stripping of the path to $QUILT_PATCHES when working in
+ sub-dirextories. (This could be fixed more flexibly later...)
-------------------------------------------------------------------
Sun Jul 11 21:33:13 PDT 2004 - mquinson@tuxfamily.org
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index a1b553a..c068496 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -397,7 +397,7 @@ find_patch()
set -- $*
if [ $# -eq 1 -a -n "$1" -a -e "$SERIES" ]
then
- local patch="${1#$QUILT_PATCHES/}"
+ local patch="${1#$SUBDIR_DOWN$QUILT_PATCHES/}"
local bre=$(quote_bre "$patch")
set -- $(@SED@ -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\)\([ "$'\t'"]\|$\)/!d" \
-e 's/[ '$'\t''].*//' $SERIES)