diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-29 22:28:11 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-29 22:28:11 +0000 |
| commit | 30b340a583d69e85451451818200604261b7a08a (patch) | |
| tree | 587d0ed79910248978f0dff1f6802adf88f0b801 | |
| parent | c936aa768a1cf0a24430b301298b2a3110d6e824 (diff) | |
| download | quilt-30b340a583d69e85451451818200604261b7a08a.tar.gz | |
- Also strip any literal "[patch]" from subject headers.
| -rw-r--r-- | doc/README.MAIL | 2 | ||||
| -rw-r--r-- | po/de.po | 10 | ||||
| -rw-r--r-- | po/fr.po | 10 | ||||
| -rw-r--r-- | po/ja.po | 10 | ||||
| -rw-r--r-- | po/quilt.pot | 10 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/mail.in | 2 | ||||
| -rw-r--r-- | test/mail.test | 2 |
8 files changed, 30 insertions, 21 deletions
diff --git a/doc/README.MAIL b/doc/README.MAIL index 66d8344..73519d0 100644 --- a/doc/README.MAIL +++ b/doc/README.MAIL @@ -44,6 +44,8 @@ patches, though: (150 characters or less), use the first paragraph as the subject. +All literal "[patch]" strings are stripped from subject headers as well. + If no subject can be extracted from a patch, or there are duplicate subjects, the mail command will print an error message and abort. @@ -782,23 +782,23 @@ msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." -#: quilt/mail.in:294 +#: quilt/mail.in:296 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:307 +#: quilt/mail.in:309 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:349 +#: quilt/mail.in:351 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:352 +#: quilt/mail.in:354 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:439 +#: quilt/mail.in:441 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -776,23 +776,23 @@ msgstr "" msgid "Could not determine the envelope sender address. Please use --sender." msgstr "Impossible de dterminer l'adresse d'expditeur. Utilisez --sender." -#: quilt/mail.in:294 +#: quilt/mail.in:296 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:307 +#: quilt/mail.in:309 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:349 +#: quilt/mail.in:351 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:352 +#: quilt/mail.in:354 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:439 +#: quilt/mail.in:441 msgid "Introduction saved as %s\\n" msgstr "" @@ -754,23 +754,23 @@ msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:294 +#: quilt/mail.in:296 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:307 +#: quilt/mail.in:309 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:349 +#: quilt/mail.in:351 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:352 +#: quilt/mail.in:354 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:439 +#: quilt/mail.in:441 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/po/quilt.pot b/po/quilt.pot index 88841c3..cf770ca 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -516,23 +516,23 @@ msgstr "" msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:294 +#: quilt/mail.in:296 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:307 +#: quilt/mail.in:309 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:349 +#: quilt/mail.in:351 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:352 +#: quilt/mail.in:354 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:439 +#: quilt/mail.in:441 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index b3cf870..bb6cdf2 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Jan 29 23:26:27 CET 2006 - agruen@suse.de + +- Also strip any literal "[patch]" from subject headers. + +------------------------------------------------------------------- Sun Jan 29 22:46:14 CET 2006 - agruen@suse.de - quilt/mail.in: diff --git a/quilt/mail.in b/quilt/mail.in index d2c231b..1707b34 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -257,6 +257,8 @@ if [ "$(type -t quilt_mail_patch_filter 2> /dev/null)" != function ]; then return 1 fi + mh[0]=$(echo "${mh[0]}" | sed -e $'s/\\[patch\\][ \t]*//i') + # Add recipients defined by some recognized keywords local saved_IFS=$IFS; IFS=$'\n' mh=( "${mh[@]}" diff --git a/test/mail.test b/test/mail.test index a8eaf6b..80cc3e9 100644 --- a/test/mail.test +++ b/test/mail.test @@ -57,7 +57,7 @@ > Patches 1.diff, 5.diff have duplicate subject headers. $ cat /dev/stdin no-subject > patches/5.diff - < Subject of 5.diff + < [patch] Subject of 5.diff < $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" |