diff options
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/mail.in | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes index c584ba4..eacb990 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 2 12:37:19 MDT 2007 - paul@pwsan.com + +- quilt mail: strip closing angle brackets from the mail sender + address before it is inserted into the message ID. (Changed + by agruen@suse.de.) + +------------------------------------------------------------------- Wed Aug 8 12:13:16 CEST 2007 - agruen@suse.de - quilt setup: replace the --path argument with --sourcedir for diff --git a/quilt/mail.in b/quilt/mail.in index f9ae313..1c7a496 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -68,7 +68,7 @@ first, and a last patch name of \`-' denotes the last patch in the series. msgid() { local timestamp=$(date --utc "+%Y%m%d%H%M%S.%N") - echo "$timestamp@${opt_sender#*@}" + echo "$timestamp@$opt_sender_address" } process_mail() @@ -88,7 +88,7 @@ process_mail() | sendmail ${QUILT_SENDMAIL_ARGS--f "$opt_sender"} "$@" else local from_date=$(date "+%a %b %e %H:%M:%S %Y") - echo "From $opt_sender $from_date" + echo "From $opt_sender_address $from_date" sed -e 's/^From />From /' $tmpfile echo fi @@ -192,6 +192,7 @@ Could not determine the envelope sender address. Please use --sender." >&2 ;; esac fi +opt_sender_address=$(echo "$opt_sender" | sed -re 's:.*<([^<>]+)>.*:\1:') if [ -z "$opt_charset" ]; then case "${LC_ALL:-$ORIGINAL_LANG}" in |