diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-01-30 22:57:57 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-01-30 22:57:57 +0000 |
| commit | 9675959b8aba7eff7bc2dd8a5089cc1670f913c5 (patch) | |
| tree | 743f7beaa58db8afe008af78f35ce55649ab9169 | |
| parent | cd40137d63cbeffec9429a7fa6cf13f7cc746070 (diff) | |
| download | quilt-9675959b8aba7eff7bc2dd8a5089cc1670f913c5.tar.gz | |
- quilt/mail.in: Don't use sed's Q command, old versions of
sed don't know about it.
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/ja.po | 2 | ||||
| -rw-r--r-- | po/quilt.pot | 2 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/mail.in | 10 |
6 files changed, 16 insertions, 8 deletions
@@ -797,7 +797,7 @@ msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:448 +#: quilt/mail.in:450 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -798,7 +798,7 @@ msgstr "" msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:448 +#: quilt/mail.in:450 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegardée en tant que %s\\n" @@ -770,7 +770,7 @@ msgstr "" msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:448 +#: quilt/mail.in:450 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/po/quilt.pot b/po/quilt.pot index 29eec7b..80c8d22 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -532,7 +532,7 @@ msgstr "" msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:448 +#: quilt/mail.in:450 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 43664a0..ee45883 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 30 23:52:55 CET 2006 - khali@linux-fr.org + +- quilt/mail.in: Don't use sed's Q command, old versions of + sed don't know about it. + +------------------------------------------------------------------- Mon Jan 30 17:42:11 CET 2006 - agruen@suse.de - quilt/mail.in: Use $(hostname) for the sender address for diff --git a/quilt/mail.in b/quilt/mail.in index d3bf274..2c79ab9 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -421,13 +421,15 @@ for patch in "${patches[@]}"; do p=${subject_prefix//@num@/$(printf %0*d ${#total} $num)} p=${p//@total@/$total} ( echo "Message-Id: <$(msgid)>" - sed -e 's/^Message-Id:/References:/' \ - -e '/^$/Q' \ + sed -n -e '/^$/q' \ + -e 's/^Message-Id:/References:/' \ + -e p \ $introduction echo "Content-Disposition: inline; filename=$patch" - sed -e '/^Recipient-.*:/d' \ + sed -n -e '/^$/q' \ + -e '/^Recipient-.*:/d' \ -e '/^Replace-.*:/d' \ - -e '/^$/Q' \ + -e p \ $body awk ' /^$/ { in_body = 1 } |