diff options
-rw-r--r-- | po/de.po | 18 | ||||
-rw-r--r-- | po/fr.po | 18 | ||||
-rw-r--r-- | po/ja.po | 31 | ||||
-rw-r--r-- | po/quilt.pot | 18 | ||||
-rw-r--r-- | quilt.changes | 8 | ||||
-rw-r--r-- | quilt/import.in | 17 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 2 |
7 files changed, 68 insertions, 44 deletions
@@ -664,41 +664,41 @@ msgstr "" "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header " "erhalten bleiben sollen.\\n" -#: quilt/import.in:125 +#: quilt/import.in:133 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" -#: quilt/import.in:145 +#: quilt/import.in:153 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:154 +#: quilt/import.in:162 msgid "Patch %s already exists in series.\\n" msgstr "Patch %s existiert bereits in der series-Datei\\n" -#: quilt/import.in:160 +#: quilt/import.in:168 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:171 +#: quilt/import.in:179 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:175 +#: quilt/import.in:183 msgid "Importing patch %s\\n" msgstr "Importiere patch %s\\n" -#: quilt/import.in:177 +#: quilt/import.in:185 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:187 +#: quilt/import.in:195 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:194 +#: quilt/import.in:204 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -668,40 +668,40 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Veuillez utiliser -d {o|a|n} pour spécifier quel(s) en-tête(s) conserver.\\n" -#: quilt/import.in:125 +#: quilt/import.in:133 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "L'option « -P » ne peut être utilisé que lors de l'import d'un seul patch.\\n" -#: quilt/import.in:145 +#: quilt/import.in:153 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/import.in:154 +#: quilt/import.in:162 msgid "Patch %s already exists in series.\\n" msgstr "Le patch %s existe déjà dans la série.\\n" -#: quilt/import.in:160 +#: quilt/import.in:168 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:171 +#: quilt/import.in:179 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:175 +#: quilt/import.in:183 msgid "Importing patch %s\\n" msgstr "Import du patch %s\\n" -#: quilt/import.in:177 +#: quilt/import.in:185 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistré dans %s)\\n" -#: quilt/import.in:187 +#: quilt/import.in:195 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:194 +#: quilt/import.in:204 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" @@ -203,7 +203,10 @@ msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " "patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " "[--color] [file ...]\\n" -msgstr "使ã„æ–¹: quilt diff [-p n] [-u|-U æ•°|-c|-C æ•°] [--combine パッãƒ|-z] [-R] [-P パッãƒ] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [ファイル ...]\\n" +msgstr "" +"使ã„æ–¹: quilt diff [-p n] [-u|-U æ•°|-c|-C æ•°] [--combine パッãƒ|-z] [-R] [-P " +"パッãƒ] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--" +"sort] [--color] [ファイル ...]\\n" #: quilt/diff.in:28 msgid "" @@ -538,7 +541,9 @@ msgstr "" msgid "" "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" -msgstr "使ã„æ–¹: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-trailing-whitespace] [パッãƒ]\\n" +msgstr "" +"使ã„æ–¹: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" +"trailing-whitespace] [パッãƒ]\\n" #: quilt/header.in:28 msgid "" @@ -639,39 +644,39 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "ã©ã®ãƒ‘ッãƒãƒ˜ãƒƒãƒ€ã‚’残ã™ã‹ã€ã‚ªãƒ—ション -d {o|a|n}を使ã£ã¦æŒ‡å®šã—ã¦ãã ã•ã„" -#: quilt/import.in:125 +#: quilt/import.in:133 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "オプション \\`-P'ã¯ã€ãƒ‘ッãƒã‚’一ã¤ã ã‘å–り込むã¨ãã®ã¿æœ‰åŠ¹ã§ã™\\n" -#: quilt/import.in:145 +#: quilt/import.in:153 msgid "Patch %s is applied\\n" msgstr "パッム%s ã¯ã€ã™ã§ã«é©ç”¨ã•ã‚Œã¦ã„ã¾ã™\\n" -#: quilt/import.in:154 +#: quilt/import.in:162 msgid "Patch %s already exists in series.\\n" msgstr "パッム%s ã¯ã€ã™ã§ã« seriesã®ä¸ã«ã‚ã‚Šã¾ã™\\n" -#: quilt/import.in:160 +#: quilt/import.in:168 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッム%s ã¯ã€ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚-fã§ç½®ãæ›ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™\\n" -#: quilt/import.in:171 +#: quilt/import.in:179 msgid "Replacing patch %s with new version\\n" msgstr "パッム%s ã‚’æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ç½®ãæ›ãˆã¾ã™\\n" -#: quilt/import.in:175 +#: quilt/import.in:183 msgid "Importing patch %s\\n" msgstr "パッム%s ã‚’å–ã‚Šè¾¼ã¿ã¾ã™\\n" -#: quilt/import.in:177 +#: quilt/import.in:185 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッム%s ã‚’å–り込んã§ã„ã¾ã™ (%s ã¨ã—ã¦ä¿å˜ã•ã‚Œã¾ã™)\\n" -#: quilt/import.in:187 +#: quilt/import.in:195 msgid "Failed to import patch %s\\n" msgstr "パッム%s ã®å–ã‚Šè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/import.in:194 +#: quilt/import.in:204 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルã¸ã®ãƒ‘ッム%s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" @@ -993,7 +998,9 @@ msgstr "最上ä½ãƒ‘ッãƒã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒæœ€åˆã«å¿…è¦ã§ã™ã€‚\\n" msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " "[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" -msgstr "使ã„æ–¹: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [パッãƒ]\\n" +msgstr "" +"使ã„æ–¹: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--" +"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [パッãƒ]\\n" #: quilt/refresh.in:26 msgid "" diff --git a/po/quilt.pot b/po/quilt.pot index 2478672..f744765 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -435,39 +435,39 @@ msgstr "" msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:125 +#: quilt/import.in:133 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:145 +#: quilt/import.in:153 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:154 +#: quilt/import.in:162 msgid "Patch %s already exists in series.\\n" msgstr "" -#: quilt/import.in:160 +#: quilt/import.in:168 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:171 +#: quilt/import.in:179 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:175 +#: quilt/import.in:183 msgid "Importing patch %s\\n" msgstr "" -#: quilt/import.in:177 +#: quilt/import.in:185 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:187 +#: quilt/import.in:195 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:194 +#: quilt/import.in:204 msgid "Failed to insert patch %s into file series\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index cf2e6b1..ffc7e94 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Jan 29 10:48:48 CET 2006 - khali@linux-fr.org + +- quilt/scripts/patchfns.in: Drop an unused local variable in + function find_patch_file. +- quilt/import.in: Add a missing print_patch call. +- quilt/import.in: Fix several temporary file leaks. + +------------------------------------------------------------------- Fri Jan 27 06:42:19 CET 2006 - agruen@suse.de - po/ja.po: Translation update from Yasushi. diff --git a/quilt/import.in b/quilt/import.in index 92c8b2b..ceed7bf 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -69,6 +69,7 @@ merge_patches() echo "$diff" >&2 printf \ $"Please use -d {o|a|n} to specify which patch header(s) to keep.\n" >&2 + rm -f $old_desc $new_desc return 1 fi fi @@ -85,6 +86,13 @@ $"Please use -d {o|a|n} to specify which patch header(s) to keep.\n" >&2 rm -f $old_desc $new_desc } +die () +{ + local status=$1 + [ "$merged_patch_file" != "$patch_file" ] && rm -f "$merged_patch_file" + exit $status +} + options=`getopt -o P:d:fp:h -- "$@"` if [ $? -ne 0 ] @@ -142,7 +150,7 @@ do if is_applied $patch then - printf $"Patch %s is applied\n" "$patch" >&2 + printf $"Patch %s is applied\n" "$(print_patch $patch)" >&2 exit 1 fi @@ -166,7 +174,7 @@ do merged_patch_file=$(gen_tempfile) merge_patches "$dest" "$patch_file" \ > $merged_patch_file \ - || exit 1 + || die 1 fi printf $"Replacing patch %s with new version\n" \ "$(print_patch $patch)" >&2 @@ -185,9 +193,11 @@ do ! cp "$merged_patch_file" "$dest" then printf $"Failed to import patch %s\n" "$(print_patch $patch)" >&2 - exit 1 + die 1 fi + [ "$merged_patch_file" != "$patch_file" ] && rm -f "$merged_patch_file" + if ! patch_in_series $patch && ! insert_in_series $patch "$patch_args" then @@ -197,7 +207,6 @@ do fi rm -rf $QUILT_PC/$patch - [ "$merged_patch_file" != "$patch_file" ] && rm -f "$merged_patch_file" done ### Local Variables: diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 4f56201..8402902 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -569,7 +569,7 @@ find_patch_file() return fi - local patch file + local patch patch=$(find_patch_in_series "$name" 2>/dev/null) if [ -z "$patch" ] |