Author: adam-guest
Date: 2008-08-30 15:03:36 +0000 (Sat, 30 Aug 2008)
New Revision: 1602
Modified:
trunk/debian/changelog
trunk/scripts/nmudiff.1
trunk/scripts/nmudiff.sh
Log:
nmudiff: Add support for using $DEBFULLNAME as well as $DEBEMAIL when
generating the From: header for a sendmail-generated mail. Thanks Thomas
Viehmann for the patch. (Closes: #496460)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-08-30 14:54:58 UTC (rev 1601)
+++ trunk/debian/changelog 2008-08-30 15:03:36 UTC (rev 1602)
@@ -23,6 +23,9 @@
the patch. (Closes: #496643)
* debsign: When copying .changes files from a remote host, attempt to process
each copied file if a wildcard was used in the filename (Closes: #491627)
+ * nmudiff: Add support for using $DEBFULLNAME as well as $DEBEMAIL when
+ generating the From: header for a sendmail-generated mail. Thanks Thomas
+ Viehmann for the patch. (Closes: #496460)
* tagpending:
+ Fix a typo in the help output. Thanks Thijs Kinkhorst. (Closes: #494131)
+ Use the new "bts --toolname" switch instead of an in-body comment to
Modified: trunk/scripts/nmudiff.1
===================================================================
--- trunk/scripts/nmudiff.1 2008-08-30 14:54:58 UTC (rev 1601)
+++ trunk/scripts/nmudiff.1 2008-08-30 15:03:36 UTC (rev 1602)
@@ -52,10 +52,10 @@
\fB\-\-from\fR \fIEMAIL\fR
If using the sendmail (\fB\-\-no\-mutt\fR) option, then the email to the
BTS will be sent using the name and address in the environment
-variable DEBEMAIL. If this is not set, then the variable EMAIL will
-be used instead. These can be overridden using the \fB\-\-from\fR
-option. The program will not work in this case if an email address
-cannot be determined.
+variables DEBEMAIL and DEBFULLNAME. If these are not set, then the
+variables EMAIL and NAME will be used instead. These can be overridden
+using the \fB\-\-from\fR option. The program will not work in this case
+if an email address cannot be determined.
.TP
\fB\-\-no\-conf\fR, \fB\-\-noconf\fR
Do not read any configuration files. This can only be used as the
Modified: trunk/scripts/nmudiff.sh
===================================================================
--- trunk/scripts/nmudiff.sh 2008-08-30 14:54:58 UTC (rev 1601)
+++ trunk/scripts/nmudiff.sh 2008-08-30 15:03:36 UTC (rev 1602)
@@ -193,6 +193,10 @@
fi
if [ "$NMUDIFF_MUTT" = no ]; then
+ if [ -z "$FROM" ]; then
+ : ${FROMNAME:="$DEBFULLNAME"}
+ : ${FROMNAME:="$NAME"}
+ fi
: ${FROM:="$DEBEMAIL"}
: ${FROM:="$EMAIL"}
if [ -z "$FROM" ]; then
@@ -200,6 +204,9 @@
echo "or EMAIL environment variable or using --from command line
option." >&2
exit 1
fi
+ if [ -n "$FROMNAME" ]; then
+ FROM="$FROMNAME <$FROM>"
+ fi
fi
if ! [ -f debian/changelog ]; then
--
To unsubscribe, send mail to [EMAIL PROTECTED]
