[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 58e2db8c886765caf1ce294ba8336fe683bcd888

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  58e2db8c886765caf1ce294ba8336fe683bcd888 (commit)
       via  0a7c642d8e5474dc67ca3a5595c07731cce7e098 (commit)
       via  9ac724c1df34e9dd56e2e35566b0cf81a491e8e6 (commit)
      from  3bede3fae77775088b8b66e7a26a5e2ee1f61fff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=58e2db8c886765caf1ce294ba8336fe683bcd888


commit 58e2db8c886765caf1ce294ba8336fe683bcd888
Author: David Levine <address@hidden>
Date:   Mon Feb 27 20:50:29 2012 -0600

    Changed domains in man page and test examples to use example.com

diff --git a/man/mh-format.man b/man/mh-format.man
index d8a83b2..2d1c69e 100644
--- a/man/mh-format.man
+++ b/man/mh-format.man
@@ -464,7 +464,7 @@ generated will be something like:
 .PP
 .RS 5
 .nf
-My From User <address@hidden>To: My From User <address@hidden>
+My From User <address@hidden>To: My From User <address@hidden>
 .fi
 .RE
 .PP
diff --git a/man/mh-tailor.man b/man/mh-tailor.man
index cc1f724..a8d400a 100644
--- a/man/mh-tailor.man
+++ b/man/mh-tailor.man
@@ -199,9 +199,9 @@ First [Middle] Last <First.Last>
 type of username masquerading.  If the user sets the
 .B $USERNAME_EXTENSION
 environment variable, its value will be appended to the actual login name.  For
-instance, if I am \*(address@hidden(rq, and I set
+instance, if I am \*(address@hidden(rq, and I set
 .B $USERNAME_EXTENSION
-to \*(lq\-www\*(rq, my mail will appear to come from \*(address@hidden(rq.  
This is meant
+to \*(lq\-www\*(rq, my mail will appear to come from \*(address@hidden(rq.  
This is meant
 to interact with qmail's \*(lquser\-extension\*(rq feature, where mail sent to
 .IR user \- string
 will be delivered to
diff --git a/man/post.man b/man/post.man
index 50b0298..4abef58 100644
--- a/man/post.man
+++ b/man/post.man
@@ -124,7 +124,7 @@ value of
 \*(lqlocalname\*(rq in
 .IR mts.conf ,
 if set).  An example is \*(lqFrom: Dan Harkless
-<address@hidden>\*(rq.  There are four ways to override these values,
+<address@hidden>\*(rq.  There are four ways to override these values,
 however.  Note that they apply equally to \*(lqResent\-From:\*(rq lines in 
messages sent
 with
 .BR dist .
@@ -136,7 +136,7 @@ contains \*(lqmmailid\*(rq, this processing is activated.  
If a user's GECOS
 field in the passwd file is of the form \*(lqFull Name <fakename>\*(rq then 
\*(lqfakename\*(rq
 will be used in place of the real username.  For instance, a GECOS field of 
\*(lqDan
 Harkless <Dan.Harkless>\*(rq would result in \*(lqFrom: Dan Harkless
-<address@hidden>\*(rq.  Naturally if you were doing something like
+<address@hidden>\*(rq.  Naturally if you were doing something like
 this you'd want to set up an MTA alias (e.g. in /etc/aliases) from, for
 instance, \*(lqDan.Harkless\*(rq to \*(lqdan\*(rq.
 .PP
@@ -156,7 +156,7 @@ environment variable will result in its value being 
appended the user's login
 name.  For instance, if I set
 .B $USERNAME_EXTENSION
 to \*(lq+www\*(rq, my \*(lqFrom:\*(rq
-line will contain \*(lqDan Harkless <address@hidden>\*(rq (or
+line will contain \*(lqDan Harkless <address@hidden>\*(rq (or
 \*(lqDan.Harkless+www\*(rq if I'm using mmailid masquerading as well).  Recent 
versions
 of
 .B sendmail
diff --git a/test/comp/test-comp-format b/test/comp/test-comp-format
index 1f1f8c5..f1c2563 100755
--- a/test/comp/test-comp-format
+++ b/test/comp/test-comp-format
@@ -30,20 +30,21 @@ EOF
 
 expected="${MH_TEST_DIR}/$$.expected"
 actual="${MH_TEST_DIR}/Mail/draft"
-from="Mr Test User <address@hidden>"
-to1="User One <address@hidden>"
-to2="User Two <address@hidden>"
-cc1="CC User One <address@hidden>"
-cc2="CC User Two <address@hidden>"
-cc3="CC User Three <address@hidden>"
-cc4="CC User Four <address@hidden>"
+from="Mr Test User <address@hidden>"
+to1="User One <address@hidden>"
+to2="User Two <address@hidden>"
+cc1="CC User One <address@hidden>"
+cc2="CC User Two <address@hidden>"
+cc3="CC User Three <address@hidden>"
+cc4="CC User Four <address@hidden>"
 fcc1="+nosuchmailbox"
 fcc2="+nosuchmailbox2"
 subject="Totally bogus subject"
 
 cat > $expected <<EOF
 From: ${from}
-To: ${to1}, ${to2}
+To: ${to1},
+    ${to2}
 cc: ${cc1},
     ${cc2},
     ${cc3},
diff --git a/test/forw/test-forw-digest b/test/forw/test-forw-digest
index 6792a78..8bdc949 100755
--- a/test/forw/test-forw-digest
+++ b/test/forw/test-forw-digest
@@ -14,13 +14,13 @@ setup_test
 
 expected="${MH_TEST_DIR}/$$.expected"
 actual="${MH_TEST_DIR}/Mail/draft"
-from="Mr Test User <address@hidden>"
-to1="User One <address@hidden>"
-to2="User Two <address@hidden>"
-cc1="CC User One <address@hidden>"
-cc2="CC User Two <address@hidden>"
-cc3="CC User Three <address@hidden>"
-cc4="CC User Four <address@hidden>"
+from="Mr Test User <address@hidden>"
+to1="User One <address@hidden>"
+to2="User Two <address@hidden>"
+cc1="CC User One <address@hidden>"
+cc2="CC User Two <address@hidden>"
+cc3="CC User Three <address@hidden>"
+cc4="CC User Four <address@hidden>"
 fcc1="+nosuchmailbox"
 fcc2="+nosuchmailbox2"
 
diff --git a/test/forw/test-forw-format b/test/forw/test-forw-format
index dc73c6c..c3e7600 100755
--- a/test/forw/test-forw-format
+++ b/test/forw/test-forw-format
@@ -30,20 +30,21 @@ EOF
 
 expected="${MH_TEST_DIR}/$$.expected"
 actual="${MH_TEST_DIR}/Mail/draft"
-from="Mr Test User <address@hidden>"
-to1="User One <address@hidden>"
-to2="User Two <address@hidden>"
-cc1="CC User One <address@hidden>"
-cc2="CC User Two <address@hidden>"
-cc3="CC User Three <address@hidden>"
-cc4="CC User Four <address@hidden>"
+from="Mr Test User <address@hidden>"
+to1="User One <address@hidden>"
+to2="User Two <address@hidden>"
+cc1="CC User One <address@hidden>"
+cc2="CC User Two <address@hidden>"
+cc3="CC User Three <address@hidden>"
+cc4="CC User Four <address@hidden>"
 fcc1="+nosuchmailbox"
 fcc2="+nosuchmailbox2"
 subject="Totally bogus subject"
 
 cat > "$expected" <<EOF
 From: ${from}
-To: ${to1}, ${to2}
+To: ${to1},
+    ${to2}
 cc: ${cc1},
     ${cc2},
     ${cc3},

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=0a7c642d8e5474dc67ca3a5595c07731cce7e098


commit 0a7c642d8e5474dc67ca3a5595c07731cce7e098
Author: David Levine <address@hidden>
Date:   Mon Feb 27 20:42:19 2012 -0600

    Fixed to report failure if getfulname hadn't been built yet.

diff --git a/test/format/test-myname b/test/format/test-myname
index dc86ea5..2b48c2f 100755
--- a/test/format/test-myname
+++ b/test/format/test-myname
@@ -4,6 +4,8 @@
 # the Signature profile entry, and via SIGNATURE environment variable.
 #
 
+set -e
+
 if test -z "${MH_OBJ_DIR}"; then
     srcdir=`dirname "$0"`/../..
     MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
@@ -13,10 +15,11 @@ fi
 
 setup_test
 
-unset SIGNATURE 
+unset SIGNATURE
 
+fullname=`${MH_OBJ_DIR}/test/getfullname`
 run_test "${MH_LIB_DIR}/ap -format %(myname) ignore" \
-         "`${MH_OBJ_DIR}/test/getfullname`" "GECOS field test"
+         "$fullname" "GECOS field test"
 
 echo "Signature: Some Random Name 1" >> ${MH}
 

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=9ac724c1df34e9dd56e2e35566b0cf81a491e8e6


commit 9ac724c1df34e9dd56e2e35566b0cf81a491e8e6
Author: David Levine <address@hidden>
Date:   Mon Feb 27 20:40:15 2012 -0600

    They test with output to a tty didn't work under make distcheck.  Tried to 
work around it by writing directly to /dev/tty, if that's available.

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 2396811..ba7c18b 100755
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -97,18 +97,24 @@ cat >$expected <<EOF
 EOF
 check $expected $actual
 
-# Produce no standard output if no messages match and standard output
-# is a tty.  To test that, move stderr to stdout.
-echo `pick -subject message.3 -and -from Test4 >&2-` >$actual
-cat >$expected <<EOF
 
-EOF
-check $expected $actual
+set +e
+
+if test -w /dev/tty; then
+  # Produce no standard output if no messages match and standard
+  # output is a tty.  To test that, move stderr to stdout and
+  # write the output directly to the tty.  If there is output,
+  # it probably won't be captured, but pretend that it would be.
+  output=`pick -subject message.3 -and -from Test4 >&2- >/dev/tty`
+  run_test "echo $output" ''
+else
+  echo "$0: skip tty test because can't write to /dev/tty"
+fi
 
 # Also, check that the exit status is 1.
-set +e
-pick -subject message.3 -and -from Test4 2>/dev/null
+pick -subject message.3 -and -from Test4 >/dev/null 2>&1
 run_test "echo $?" '1'
+
 set -e
 
 # Test -cc.
@@ -137,8 +143,8 @@ pick -after '28 Sep 2008 00:00:00' >$actual 2>&1
 cat >$expected <<EOF
 11
 EOF
-
 check $expected $actual
+
 # Invert exit status so execution doesn't terminate due to -e.
 ! pick -after '29 Sep 2008 00:00:00' >$actual 2>/dev/null
 cat >$expected <<EOF

-----------------------------------------------------------------------

Summary of changes:
 man/mh-format.man          |    2 +-
 man/mh-tailor.man          |    4 ++--
 man/post.man               |    6 +++---
 test/comp/test-comp-format |   17 +++++++++--------
 test/format/test-myname    |    7 +++++--
 test/forw/test-forw-digest |   14 +++++++-------
 test/forw/test-forw-format |   17 +++++++++--------
 test/pick/test-pick        |   24 +++++++++++++++---------
 8 files changed, 51 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System