diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-02-11 22:58:09 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-02-11 22:58:09 +0000 |
| commit | ed6ce993f126d508cd6a57e2770f8ec82db9cf8b (patch) | |
| tree | 93af994fda1605031a567cc948d68803fcb1da55 | |
| parent | 68306aa9907c1841aa086aa38c5b00d7a633b288 (diff) | |
| download | quilt-ed6ce993f126d508cd6a57e2770f8ec82db9cf8b.tar.gz | |
- Two bash 3.1 compatibility fixes from Arnaud Patard
<apatard@mandriva.com> -- thank you.
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/ja.po | 6 | ||||
| -rw-r--r-- | po/quilt.pot | 6 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/fork.in | 14 | ||||
| -rw-r--r-- | quilt/push.in | 4 |
7 files changed, 24 insertions, 24 deletions
@@ -452,15 +452,15 @@ msgstr "" "die\n" "Nummer erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:94 +#: quilt/fork.in:88 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n" -#: quilt/fork.in:106 +#: quilt/fork.in:100 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s auf %s\\n" -#: quilt/fork.in:112 +#: quilt/fork.in:106 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" @@ -455,15 +455,15 @@ msgstr "" "tiret suivi d'un nombre, ce nombre est augment la place (par\n" "exemple : patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:94 +#: quilt/fork.in:88 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom\\n" -#: quilt/fork.in:106 +#: quilt/fork.in:100 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Le fork de %s en %s a chou\\n" -#: quilt/fork.in:112 +#: quilt/fork.in:106 msgid "Fork of patch %s created as %s\\n" msgstr "Le fork de %s a t cr en tant que %s\\n" @@ -437,15 +437,15 @@ msgstr "" "\\`-2' が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える " "(例: patch.diff、patch-2.diff、patch-3.diff)。\n" -#: quilt/fork.in:94 +#: quilt/fork.in:88 msgid "Patch %s exists already, please choose a new name\\n" msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n" -#: quilt/fork.in:106 +#: quilt/fork.in:100 msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n" -#: quilt/fork.in:112 +#: quilt/fork.in:106 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %s の分岐で %s が作成されました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index c21e909..1d07bc8 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -302,15 +302,15 @@ msgid "" "patch-2.diff, patch-3.diff).\n" msgstr "" -#: quilt/fork.in:94 +#: quilt/fork.in:88 msgid "Patch %s exists already, please choose a new name\\n" msgstr "" -#: quilt/fork.in:106 +#: quilt/fork.in:100 msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: quilt/fork.in:112 +#: quilt/fork.in:106 msgid "Fork of patch %s created as %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 185ca53..0541126 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Feb 11 23:57:09 CET 2006 - agruen@suse.de + +- Two bash 3.1 compatibility fixes from Arnaud Patard + <apatard@mandriva.com> -- thank you. + +------------------------------------------------------------------- Sat Feb 11 16:16:25 CET 2006 - agruen@suse.de - Some versions of mkdir screw up on `mkdir -p dir/.' when dir diff --git a/quilt/fork.in b/quilt/fork.in index f45b5bd..57a8eff 100644 --- a/quilt/fork.in +++ b/quilt/fork.in @@ -73,16 +73,10 @@ then new_patch="$1" else base=$(echo "$top_patch" \ - | sed -e 's:\(\|\.diff\?\|\.patch\)\(\|\.gz\|\.bz2\)$::') - num=$(echo "$base" \ - | sed -ne 's:.*\(-[0-9]\+\)$:\1:'p) - if [ -n "$num" ] - then - new_patch="${base:0:${#base}-${#num}}-$((${num:1}+1))" - else - new_patch="$base-2" - fi - new_patch="$new_patch${top_patch:${#base}}" + | sed -r -e 's:(\.gz|\.bz2)$::' -e 's:(\.diff?|\.patch)$::') + num=$(echo "$base" | sed -nre 's:.*-([0-9]+)$:\1:'p) + [ -n "$num" ] || num=1 + new_patch="${base%-$num}-$((num+1))${top_patch#$base}" fi new_patch=${new_patch#$QUILT_PATCHES/} diff --git a/quilt/push.in b/quilt/push.in index bbf3310..9699efc 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -97,9 +97,9 @@ push_patch_args() patch_args "$patch" else set -- $(patch_args "$patch") - if [ "${*/-R}" != "$*" ] + if [ "${*#-R}" != "$*" ] then - echo "${*/-R}" + echo "${*#-R}" else echo "$*" -R fi |