[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.22.2-12-g6a1d34d

[Antti-Juhani Kaijanaho]

The following commit has been merged in the master branch:
commit 29e0bb8ffd3648ce0760d2dfe4e10c7eafd9f76c
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Fri Jun 8 23:22:15 2012 +0300

    tester.sh: Handle missing diffs gracefully.
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 3d79907..a89f952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ dctrl-tools (2.23) UNRELEASED; urgency=low
   * lib/msg.c (msg_primitive): Write the period before the newline, not after!
   * tests/0022.{out,err,fails}: New test case, for grep-dctrl
     --ignore-parse-errors
+  * tester.sh: Handle missing diffs gracefully.
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Fri, 08 Jun 2012 22:39:44 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Fri, 08 Jun 2012 23:21:58 +0300
 
 dctrl-tools (2.22.2) unstable; urgency=low
 
diff --git a/tester.sh b/tester.sh
index dfe609e..31cb318 100644
--- a/tester.sh
+++ b/tester.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #     dctrl-tools - Debian control file inspection tools
-#     Copyright (C) 2007, 2010, 2011 Antti-Juhani Kaijanaho
+#     Copyright (C) 2007, 2010, 2011, 2012 Antti-Juhani Kaijanaho
 #
 #     This program is free software; you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
@@ -83,10 +83,18 @@ for tst in $tests ; do
         echo "ok."
     else
         echo "FAILED."
-        echo "stdout diff:"
-        cat .diffout
-        echo "stderr diff:"
-        cat .differr
+        if [ -r .diffout ] ; then
+            echo "stdout diff:"
+            cat .diffout
+        else
+            echo "no stdout diff"
+        fi
+        if [ -r .differr ] ; then
+            echo "stderr diff:"
+            cat .differr
+        else
+            echo "no stderr diff"
+        fi
         rv=1
     fi
 done

-- 
Debian control file query tools