diff options
-rw-r--r-- | po/de.po | 12 | ||||
-rw-r--r-- | po/fr.po | 12 | ||||
-rw-r--r-- | po/ja.po | 12 | ||||
-rw-r--r-- | po/quilt.pot | 12 | ||||
-rw-r--r-- | quilt.changes | 12 | ||||
-rw-r--r-- | quilt/mail.in | 7 | ||||
-rw-r--r-- | test/mail.test | 8 |
7 files changed, 40 insertions, 35 deletions
@@ -776,28 +776,28 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: quilt/mail.in:161 +#: quilt/mail.in:166 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:298 +#: quilt/mail.in:303 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:311 +#: quilt/mail.in:316 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:353 +#: quilt/mail.in:358 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:356 +#: quilt/mail.in:361 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:443 +#: quilt/mail.in:448 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -777,28 +777,28 @@ msgstr "" "\tAjoute un destinataire dans le champ d'en-tte A, Copie ou Copie\n" "\tcache, respectivement.\n" -#: quilt/mail.in:161 +#: quilt/mail.in:166 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "Impossible de dterminer l'adresse d'expditeur. Utilisez --sender." -#: quilt/mail.in:298 +#: quilt/mail.in:303 msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:311 +#: quilt/mail.in:316 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqus.\\n" -#: quilt/mail.in:353 +#: quilt/mail.in:358 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" "L'introduction n'a pas de ligne de sujet (sauvegard en tant que %s)\\n" -#: quilt/mail.in:356 +#: quilt/mail.in:361 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:443 +#: quilt/mail.in:448 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegarde en tant que %s\\n" @@ -748,29 +748,29 @@ msgstr "" "--to, --cc, --bcc\n" "\tToやCC、BCCへの受信者の追加。\n" -#: quilt/mail.in:161 +#: quilt/mail.in:166 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:298 +#: quilt/mail.in:303 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:311 +#: quilt/mail.in:316 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:353 +#: quilt/mail.in:358 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:356 +#: quilt/mail.in:361 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:443 +#: quilt/mail.in:448 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/po/quilt.pot b/po/quilt.pot index 68b653c..29eec7b 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -512,27 +512,27 @@ msgid "" "\tAppend a recipient to the To, Cc, or Bcc header.\n" msgstr "" -#: quilt/mail.in:161 +#: quilt/mail.in:166 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:298 +#: quilt/mail.in:303 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:311 +#: quilt/mail.in:316 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:353 +#: quilt/mail.in:358 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:356 +#: quilt/mail.in:361 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:443 +#: quilt/mail.in:448 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index e495b5b..43664a0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 30 17:42:11 CET 2006 - agruen@suse.de + +- quilt/mail.in: Use $(hostname) for the sender address for + platforms on which $(hostname -f) doesn't work. + +------------------------------------------------------------------- Mon Jan 30 11:57:54 CET 2006 - jayvdb@gmail.com - Properly handle spaces in arguments to getopt. @@ -17,12 +23,6 @@ Mon Jan 30 11:46:21 CET 2006 - jayvdb@gmail.com build, causing errors during the construction of $(DOC). ------------------------------------------------------------------- -Mon Jan 30 11:44:27 CET 2006 - agruen@suse.de - -- test/mail.test: Use --sender option to avoid calling - hostname -f on platforms that don't support -f. - -------------------------------------------------------------------- Mon Jan 30 11:36:16 CET 2006 - jayvdb@gmail.com - test/mail.test: /dev/stdin & /dev/stdout dont exist on Tru64. diff --git a/quilt/mail.in b/quilt/mail.in index 4e74f21..d3bf274 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -154,7 +154,12 @@ then fi if [ -z "$opt_sender" ]; then - opt_sender="${LOGNAME:-$(whoami)}@$(hostname -f 2>/dev/null)" + hostname=$(hostname -f 2>/dev/null) + if [ "$hostname" = "${hostname/.}" ] + then + hostname=$(hostname) + fi + opt_sender="${LOGNAME:-$(whoami)}@$hostname" case "$opt_sender" in *@*.*) ;; *) diff --git a/test/mail.test b/test/mail.test index 2bbee7d..ce38b10 100644 --- a/test/mail.test +++ b/test/mail.test @@ -12,7 +12,7 @@ $ cat no-subject > patches/1.diff $ ls patches/ > series - $ quilt mail --mbox mbox --prefix "test" --sender user@domain.name --subject "This is a test" -m "Message" + $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" > Unable to extract a subject header from patches/1.diff $ cat - no-subject > patches/1.diff @@ -21,7 +21,7 @@ < Acked-by: Dummy <dummy@some.where> < - $ quilt mail --mbox mbox --prefix "test" --sender user@domain.name -m "Message" + $ quilt mail --mbox mbox --prefix "test" -m "Message" > Introduction has no subject header $ cat - no-subject > patches/2.diff @@ -53,14 +53,14 @@ < $ ls patches/ > series - $ quilt mail --mbox mbox --prefix "test" --sender user@domain.name --subject "This is a test" -m "Message" + $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" > Patches 1.diff, 5.diff have duplicate subject headers. $ cat - no-subject > patches/5.diff < Aw: [patch] Fwd: Re: [patch 5/7] Fw: Subject of 5.diff < - $ quilt mail --mbox mbox --prefix "test" --sender user@domain.name --subject "This is a test" -m "Message" + $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" $ grep -e '^Subject:' -e '^To:' -e '^Cc:' -e '^--$' mbox > Subject: [test 0/5] This is a test > -- |