diff options
-rw-r--r-- | po/de.po | 12 | ||||
-rw-r--r-- | po/fr.po | 12 | ||||
-rw-r--r-- | po/quilt.pot | 12 | ||||
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/import.in | 10 |
5 files changed, 32 insertions, 20 deletions
@@ -404,27 +404,27 @@ msgstr "" "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches " "verwendet werden" -#: ../quilt/import.in:90 +#: ../quilt/import.in:94 msgid "Patch $patch is applied." msgstr "Patch $patch ist angewandt." -#: ../quilt/import.in:98 +#: ../quilt/import.in:102 msgid "Patch $patch exists. Replace with -f." msgstr "Patch $patch existiert bereits. Ersetzen mit -f." -#: ../quilt/import.in:101 +#: ../quilt/import.in:105 msgid "Replacing patch $patch with new version" msgstr "Ersetze Patch $patch durch neuere Version" -#: ../quilt/import.in:103 +#: ../quilt/import.in:107 msgid "Importing patch $patch_file (stored as $patch)" msgstr "Importiere Patch $patch_file (abgelegt als $patch)" -#: ../quilt/import.in:107 +#: ../quilt/import.in:113 msgid "Failed to import patch $patch" msgstr "Konnte Patch $patch nicht importieren" -#: ../quilt/import.in:114 +#: ../quilt/import.in:120 msgid "Failed to insert $patch in file series." msgstr "Konnte Patch $patch nicht in die series-Datei einfügen." @@ -409,27 +409,27 @@ msgid "Option \\`-n' can only be used when importing a single patch" msgstr "" "L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch." -#: ../quilt/import.in:90 +#: ../quilt/import.in:94 msgid "Patch $patch is applied." msgstr "Le patch $patch est appliqué." -#: ../quilt/import.in:98 +#: ../quilt/import.in:102 msgid "Patch $patch exists. Replace with -f." msgstr "Le patch $patch existe. Utilisez -f pour le remplacer." -#: ../quilt/import.in:101 +#: ../quilt/import.in:105 msgid "Replacing patch $patch with new version" msgstr "Remplacement du patch $patch avec la nouvelle version" -#: ../quilt/import.in:103 +#: ../quilt/import.in:107 msgid "Importing patch $patch_file (stored as $patch)" msgstr "Import du patch $patch_file (enregistré dans $patch)" -#: ../quilt/import.in:107 +#: ../quilt/import.in:113 msgid "Failed to import patch $patch" msgstr "Impossible d'importer le patch $patch" -#: ../quilt/import.in:114 +#: ../quilt/import.in:120 msgid "Failed to insert $patch in file series." msgstr "Impossible d'inserer $patch dans le fichier de série." diff --git a/po/quilt.pot b/po/quilt.pot index 7473b55..8b23e7d 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -297,27 +297,27 @@ msgstr "" msgid "Option \\`-n' can only be used when importing a single patch" msgstr "" -#: ../quilt/import.in:90 +#: ../quilt/import.in:94 msgid "Patch $patch is applied." msgstr "" -#: ../quilt/import.in:98 +#: ../quilt/import.in:102 msgid "Patch $patch exists. Replace with -f." msgstr "" -#: ../quilt/import.in:101 +#: ../quilt/import.in:105 msgid "Replacing patch $patch with new version" msgstr "" -#: ../quilt/import.in:103 +#: ../quilt/import.in:107 msgid "Importing patch $patch_file (stored as $patch)" msgstr "" -#: ../quilt/import.in:107 +#: ../quilt/import.in:113 msgid "Failed to import patch $patch" msgstr "" -#: ../quilt/import.in:114 +#: ../quilt/import.in:120 msgid "Failed to insert $patch in file series." msgstr "" diff --git a/quilt.changes b/quilt.changes index 8efae38..96629df 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Jun 6 03:35:32 CEST 2004 - agruen@suse.de + +- import: Create patches/ and parent directories to patch to be + imported. Insert the correct patch name in the series file. + +------------------------------------------------------------------- Sun Jun 6 02:02:32 CEST 2004 - agruen@suse.de - backup-file.c: Add code to recursively search .pc directories. diff --git a/quilt/import.in b/quilt/import.in index afac1c6..03f30ab 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -83,6 +83,10 @@ do patch=$opt_patch else patch=$patch_file + while [ "${patch#/}" != "$patch" ] + do + patch=${patch#/} + done fi if is_applied $patch @@ -102,14 +106,16 @@ do else echo $"Importing patch $patch_file (stored as $patch)" fi - if ! cp "$patch_file" "$QUILT_PATCHES/$patch" + dest=$QUILT_PATCHES/$patch + mkdir -p "${dest%/*}" + if ! cp "$patch_file" "$dest" then echo $"Failed to import patch $patch" exit 1 fi if ! patch_in_series $patch && - ! insert_in_series $opt_patch "$patch_args" + ! insert_in_series $patch "$patch_args" then echo $"Failed to insert $patch in file series." fi |