summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-06-26 21:25:30 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-06-26 21:25:30 +0000
commit7b7749bfa3ad2c1fcc308914113c6a4258e246e7 (patch)
tree80af1dbe941e0d8d069d1e4cf7c9c7852a11b792
parent73d2de1f10719972e108c857e1f7e8b80a5a4e0d (diff)
downloadquilt-7b7749bfa3ad2c1fcc308914113c6a4258e246e7.tar.gz
- Quilt import: when importing patches with their original file
name, strip path prefixes from the patch names.
-rw-r--r--quilt.changes6
-rw-r--r--quilt/import.in6
2 files changed, 7 insertions, 5 deletions
diff --git a/quilt.changes b/quilt.changes
index 338917e..feb87b6 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sat Jun 26 23:24:42 CEST 2004 - agruen@suse.de
+
+- Quilt import: when importing patches with their original file
+ name, strip path prefixes from the patch names.
+
+-------------------------------------------------------------------
Sat Jun 12 03:03:46 CEST 2004 - agruen@suse.de
- Fix another upgrade bug: The series file may optionally contain
diff --git a/quilt/import.in b/quilt/import.in
index 03f30ab..9be062a 100644
--- a/quilt/import.in
+++ b/quilt/import.in
@@ -82,11 +82,7 @@ do
then
patch=$opt_patch
else
- patch=$patch_file
- while [ "${patch#/}" != "$patch" ]
- do
- patch=${patch#/}
- done
+ patch=${patch_file#*/}
fi
if is_applied $patch