summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-06-01 10:01:21 +0000
committerJean Delvare <khali@linux-fr.org>2006-06-01 10:01:21 +0000
commita5ac27c625268f8b8f2e299965425dd3a8c42fc5 (patch)
tree88b3799625c341b68127eec858c50099b93f6183
parente5d2e157955a2e8fa0960afcc8083bf11f6d33b2 (diff)
downloadquilt-a5ac27c625268f8b8f2e299965425dd3a8c42fc5.tar.gz
- quilt/import.in: Add some missing quotes. This makes it possible
to import a patch with unfriendly characters (say spaces) in its name as long as it is renamed to something more friendly in the process.
-rw-r--r--quilt.changes10
-rw-r--r--quilt/import.in4
2 files changed, 11 insertions, 3 deletions
diff --git a/quilt.changes b/quilt.changes
index 24f8727..8673169 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,10 +1,18 @@
-------------------------------------------------------------------
+Thu Jun 1 11:56:34 CEST 2006 - khali@linux-fr.org
+
+- quilt/import.in: Add some missing quotes. This makes it possible
+ to import a patch with unfriendly characters (say spaces) in its
+ name as long as it is renamed to something more friendly in the
+ process.
+
+-------------------------------------------------------------------
Thu Jun 1 11:29:10 CEST 2006 - agruen@suse.de
- compat/rpmbuild.in: Add a version that tries to execute a
rpmbuild that may have been installed after building quilt.
- compat/diffstat.in: Same as for compat/rpmbuild.in, try to
- execute rpmbuild even though none was there at quilt build
+ execute diffstat even though none was there at quilt build
time.
- aclocal.m4: Fix a quoting error.
diff --git a/quilt/import.in b/quilt/import.in
index 1584691..9ee3b35 100644
--- a/quilt/import.in
+++ b/quilt/import.in
@@ -145,8 +145,8 @@ do
patch=${patch_file##*/}
fi
- patch_file=$(find_patch_file $patch_file) || exit 1
- merged_patch_file=$patch_file
+ patch_file=$(find_patch_file "$patch_file") || exit 1
+ merged_patch_file="$patch_file"
if is_applied $patch
then