[SCM] GNU Mailutils branch, master, updated. release-2.2-610-gb591335

[Sergey Poznyakoff]

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 "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=b5913357069b49cbf77c1ff263460ee2e13148e9

The branch, master has been updated
       via  b5913357069b49cbf77c1ff263460ee2e13148e9 (commit)
       via  844f7fed0547be2bf3643a7294160ea7ffd6cb69 (commit)
      from  d2455d52c2789022e57b80584140248aedd3973e (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 -----------------------------------------------------------------
commit b5913357069b49cbf77c1ff263460ee2e13148e9
Author: Sergey Poznyakoff <address@hidden>
Date:   Sun Jun 10 16:34:56 2012 +0300

    Fix in configuration reduction routines.
    
    * libmailutils/cfg/parser.y (mu_cfg_preorder): Accept null node
    lists.

commit 844f7fed0547be2bf3643a7294160ea7ffd6cb69
Author: Sergey Poznyakoff <address@hidden>
Date:   Fri Jun 8 21:09:57 2012 +0300

    Fix bug in mh testsuite.
    
    We cannot assume that $HOME points to existing directory.
    
    * mh/tests/testsuite.at (MH_SETUP): Override HOME environment
    variable. Use it instead of curdir.
    * mh/tests/atlocal.in (remove_curdir): Likewise.
    * mh/tests/mhn.at: Likewise.

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

Summary of changes:
 libmailutils/cfg/parser.y |    2 ++
 mh/tests/atlocal.in       |    2 +-
 mh/tests/mhn.at           |    6 +++---
 mh/tests/testsuite.at     |   11 ++++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
index ac69e6d..2b93136 100644
--- a/libmailutils/cfg/parser.y
+++ b/libmailutils/cfg/parser.y
@@ -655,6 +655,8 @@ _mu_cfg_preorder_recursive (void *item, void *cbdata)
 int
 mu_cfg_preorder (mu_list_t nodelist, struct mu_cfg_iter_closure *clos)
 {
+  if (!nodelist)
+    return 0;
   return mu_list_foreach (nodelist, _mu_cfg_preorder_recursive, clos);
 }
 
diff --git a/mh/tests/atlocal.in b/mh/tests/atlocal.in
index 53b512f..282b2b8 100644
--- a/mh/tests/atlocal.in
+++ b/mh/tests/atlocal.in
@@ -4,7 +4,7 @@
 
 address@hidden@:@abs_top_builddir@/mh:$top_srcdir:$srcdir:$PATH
 remove_curdir() {
-       sed "s|$curdir/*||;s|  *$||" $*
+       sed "s|$HOME/*||;s|  *$||" $*
 }      
 # mimeflt [FILE]
 # Filter out all variable information from a MIME message in FILE.
diff --git a/mh/tests/mhn.at b/mh/tests/mhn.at
index 4625b39..48de9c3 100644
--- a/mh/tests/mhn.at
+++ b/mh/tests/mhn.at
@@ -176,7 +176,7 @@ cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
 MUT_MBCHMOD(Mail/inbox, 700)
 
 mkdir out
-echo "mhn-storage: $curdir/out" >> $MH
+echo "mhn-storage: $HOME/out" >> $MH
 
 mhn +inbox -store 4 | remove_curdir || echo $?
 ],
@@ -212,7 +212,7 @@ mkdir out
 cp $abs_top_srcdir/testsuite/mh/mbox1/4 Mail/inbox
 MUT_MBCHMOD(Mail/inbox, 700)
 
-echo "mhn-store-application: $curdir/out/%m%P.%s" >> $MH
+echo "mhn-store-application: $HOME/out/%m%P.%s" >> $MH
 mhn +inbox -store 4 | remove_curdir || exit $?
 ],
 [0],
@@ -262,7 +262,7 @@ echo "Current-Folder: inbox" > Mail/context
 echo "mhn-store-text: | $abs_top_srcdir/mh/tests/mhed -" >> $MH
 dnl ! Note extra quoting in the sed argument below, necessary because of
 dnl ! unbalanced parentheses.
-mhn +inbox -store -part 1 4 | sed ["s|$abs_top_srcdir/mh/tests/||;s|(cd 
\(.*\)\;|(cd home\;|;s|  *$||"] || exit $?
+mhn +inbox -store -part 1 4 | sed ["s|$abs_top_srcdir/mh/tests/||g;s|(cd 
\(.*\)\;|(cd home\;|;s|  *$||"] || exit $?
 ],
 [0],
 [-- Editor invocation: -
diff --git a/mh/tests/testsuite.at b/mh/tests/testsuite.at
index d8a90ef..4c02bc8 100644
--- a/mh/tests/testsuite.at
+++ b/mh/tests/testsuite.at
@@ -18,15 +18,16 @@ m4_include([testsuite.inc])
 
 m4_define([MH_SETUP],[
 test -d Mail || mkdir Mail
-curdir=`pwd`
-MH=$curdir/mh_profile
+HOME=`pwd`
+export HOME
+MH=$HOME/mh_profile
 export MH
 cat > $MH <<EOT
-Path: $curdir/Mail
+Path: $HOME/Mail
 mhetcdir: $abs_top_srcdir/mh/etc
 moreproc: /bin/cat
 EOT
-MTSTAILOR=$curdir/mtstailor
+MTSTAILOR=$HOME/mtstailor
 export MTSTAILOR
 exec <&-
 ])
@@ -39,7 +40,7 @@ username: mhtester
 url: sendmail://$abs_top_builddir/examples/mta
 EOT
 
-MTA_DIAG=$curdir/mta.diag
+MTA_DIAG=$HOME/mta.diag
 export MTA_DIAG
 MTA_DOMAIN=example.net
 export MTA_DOMAIN


hooks/post-receive
-- 
GNU Mailutils