diff options
| -rw-r--r-- | po/de.po | 8 | ||||
| -rw-r--r-- | po/fr.po | 8 | ||||
| -rw-r--r-- | po/ja.po | 8 | ||||
| -rw-r--r-- | po/quilt.pot | 8 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/mail.in | 14 | ||||
| -rw-r--r-- | test/mail.test | 2 |
7 files changed, 34 insertions, 19 deletions
@@ -785,19 +785,19 @@ msgstr "" msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:316 +#: quilt/mail.in:326 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:358 +#: quilt/mail.in:368 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:361 +#: quilt/mail.in:371 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:450 +#: quilt/mail.in:460 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -786,20 +786,20 @@ msgstr "Impossible de dterminer l'adresse d'expditeur. Utilisez --sender." msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:316 +#: quilt/mail.in:326 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqus.\\n" -#: quilt/mail.in:358 +#: quilt/mail.in:368 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:361 +#: quilt/mail.in:371 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:450 +#: quilt/mail.in:460 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegarde en tant que %s\\n" @@ -763,19 +763,19 @@ msgstr "" msgid "Unable to extract a subject header from %s\\n" msgstr "%s から件名を取り出せません。\\n" -#: quilt/mail.in:316 +#: quilt/mail.in:326 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッチ %s の件名が重複しています。\\n" -#: quilt/mail.in:358 +#: quilt/mail.in:368 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "序文に件名がありません(%s として保存されました)\\n" -#: quilt/mail.in:361 +#: quilt/mail.in:371 msgid "Introduction has no subject header\\n" msgstr "序文に件名がありません\\n" -#: quilt/mail.in:450 +#: quilt/mail.in:460 msgid "Introduction saved as %s\\n" msgstr "序文は %s という名前で保存されました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 0908f03..1a4e621 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -520,19 +520,19 @@ msgstr "" msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:316 +#: quilt/mail.in:326 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:358 +#: quilt/mail.in:368 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:361 +#: quilt/mail.in:371 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:450 +#: quilt/mail.in:460 msgid "Introduction saved as %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 47b7769..d4bc96f 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 1 05:17:05 CET 2006 - jayvdb@gmail.com + +- Filter duplicates with awk instead of usig uniq -D. + +------------------------------------------------------------------- Wed Feb 1 05:04:04 CET 2006 - agruen@suse.de - Clean up quoting in messages. diff --git a/quilt/mail.in b/quilt/mail.in index 082cb65..5dfca49 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -310,8 +310,18 @@ done dup_subjects=( $( printf "%s\n" "${subjects[@]}" \ | sort -k2 \ - | uniq -D -f1 \ - | cut -f1) ) + | awk '{ patch = $1 ; sub(/^[^\t]+\t/, ""); + if ($0 in subjects) { + if (subjects[$0] != "") + print subjects[$0]; + print patch; + subjects[$0] = ""; + } + else subjects[$0] = patch }' \ + | while read patch; do + echo "$(print_patch "$patch")" + done + ) ) if [ ${#dup_subjects[@]} -ne 0 ]; then printf $"Patches %s have duplicate subject headers.\n" \ "$(set -- "${dup_subjects[*]/%/, }"; echo ${1%, })" diff --git a/test/mail.test b/test/mail.test index ce38b10..54764e0 100644 --- a/test/mail.test +++ b/test/mail.test @@ -54,7 +54,7 @@ $ ls patches/ > series $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" - > Patches 1.diff, 5.diff have duplicate subject headers. + > Patches patches/1.diff, patches/5.diff have duplicate subject headers. $ cat - no-subject > patches/5.diff < Aw: [patch] Fwd: Re: [patch 5/7] Fw: Subject of 5.diff |