[Quilt-dev] Some small bugfixes

[Joe Green]

I've attached some patches that fix some small bugs in the current tree:

  - Another sed \t\r problem, in Makefile.in
  - Bad error message on "quilt delete" of non-existent patch
  - "import" doesn't remove all leading components on patch file
  - Misspelling in "import" help text

--
Joe Green <address@hidden>
MontaVista Software, Inc.

"\t" and "\n" are not accepted directly in regular expressions by many
versions of GNU sed.  This patch replaces occurrences of this with
the bash syntax $'\t' or $'\\\n' where necessary.

Joe Green <address@hidden>


Index: quilt-0.34/Makefile.in
===================================================================
--- quilt-0.34.orig/Makefile.in
+++ quilt-0.34/Makefile.in
@@ -141,8 +141,8 @@
                 echo ;                                  \
                (bash -c ". scripts/patchfns ; LC_ALL=C . $$here/$$cmd -h")| \
                 grep -v 'Usage: quilt' |                \
-                  sed -e 's/^\t//'                      \
-                      -e 's/\t/\n/' |                   \
+                  sed -e $$'s/^\t//'                    \
+                      -e $$'s/\t/\\\n/' |               \
                   sed -e 's/^\(-.*\)$$/.IP "    \1" 8/';\
                 echo;                                   \
               done                                      \

Delete of non-existent patch doesn't correctly show the patch name in
error message.

Joe Green <address@hidden>

Index: quilt-0.34/quilt/delete.in
===================================================================
--- quilt-0.34.orig/quilt/delete.in     2004-01-31 13:44:56.000000000 +0000
+++ quilt-0.34/quilt/delete.in  2004-06-29 21:50:31.000000000 +0000
@@ -68,9 +68,10 @@
                exit 1
        fi
 else
+       opatch="$patch"
        if ! patch=$(find_patch $patch)
        then
-               echo $"Patch $patch is not in series"
+               echo $"Patch $opatch is not in series"
                exit 1
        fi
 fi

Source: MontaVista Software, Inc
Type: Bug Fix
Description:
    Delete all leading components to make basename of patch path.

Index: quilt-0.34/quilt/import.in
===================================================================
--- quilt-0.34.orig/quilt/import.in     2004-06-29 21:56:45.000000000 +0000
+++ quilt-0.34/quilt/import.in  2004-06-29 21:57:05.000000000 +0000
@@ -82,7 +82,7 @@
        then
                patch=$opt_patch
        else
-               patch=${patch_file#*/}
+               patch=${patch_file##*/}
        fi
 
        if is_applied $patch

Source: MontaVista Software, Inc
Type: Defect Fix
Description:
    Fix various small typographical errors.

Index: quilt-0.34/quilt/import.in
===================================================================
--- quilt-0.34.orig/quilt/import.in
+++ quilt-0.34/quilt/import.in
@@ -26,7 +26,7 @@
 Import external patches.
 
 -p num
-       Number of directory levels to strip when aplying (default=1)
+       Number of directory levels to strip when applying (default=1)
 
 -n patch
        Patch filename to use inside quilt. This option can only be
Index: quilt-0.34/po/fr.po
===================================================================
--- quilt-0.34.orig/po/fr.po
+++ quilt-0.34/po/fr.po
@@ -391,7 +391,7 @@
 "Import external patches.\n"
 "\n"
 "-p num\n"
-"\tNumber of directory levels to strip when aplying (default=1)\n"
+"\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
 "-n patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
Index: quilt-0.34/po/quilt.pot
===================================================================
--- quilt-0.34.orig/po/quilt.pot
+++ quilt-0.34/po/quilt.pot
@@ -288,7 +288,7 @@
 "Import external patches.\n"
 "\n"
 "-p num\n"
-"\tNumber of directory levels to strip when aplying (default=1)\n"
+"\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
 "-n patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"
Index: quilt-0.34/po/de.po
===================================================================
--- quilt-0.34.orig/po/de.po
+++ quilt-0.34/po/de.po
@@ -386,7 +386,7 @@
 "Import external patches.\n"
 "\n"
 "-p num\n"
-"\tNumber of directory levels to strip when aplying (default=1)\n"
+"\tNumber of directory levels to strip when applying (default=1)\n"
 "\n"
 "-n patch\n"
 "\tPatch filename to use inside quilt. This option can only be\n"