Bug #652034: Handle multiple instances of the same field gracefully.

For grep-dctrl, this means having -F search for all of the same-name
fields disjunctively.  The -s option selects all same-name fields for
printing.

For the other tools, all but the first are ignored.

No string changes, so committing to maint-2.20 for release with 2.20.1.

Signed-off-by: Antti-Juhani Kaijanaho <ajk@debian.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/tester.sh b/tester.sh
index 1c35d0b..dfe609e 100644
--- a/tester.sh
+++ b/tester.sh
@@ -46,6 +46,9 @@ for tst in $tests ; do
     if [ ! -r $tst_in ] ; then
         tst_in=/dev/null
     fi
+    if [ ! -r $tst_ero ] ; then
+        tst_ero=/dev/null
+    fi
     if [ ! -r $tst_out ] && [ ! -r $tst_err ] ; then
         echo 1>&2 "neither $tst_out nor $tst_err exists"
         exit 1
@@ -82,10 +85,8 @@ for tst in $tests ; do
         echo "FAILED."
         echo "stdout diff:"
         cat .diffout
-        if [ -r $tst_ero ] ; then
-            echo "stderr diff:"
-            cat .differr
-        fi
+        echo "stderr diff:"
+        cat .differr
         rv=1
     fi
 done