diff -r 4f8054d3171b -r 2944a6d35158 contrib/check-code.py
--- a/contrib/check-code.py	Wed Aug 08 18:10:16 2012 +0200
+++ b/contrib/check-code.py	Wed Aug 08 18:10:30 2012 +0200
@@ -91,7 +91,7 @@
 uprefix = r"^  \$ "
 utestpats = [
   [
-    (r'^(\S|  \$ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
+    (r'^(\S.*||  \$ .*)[ \t]\n', "trailing whitespace on non-output"),
     (uprefix + r'.*\|\s*sed[^|>\n]*\n',
      "use regex test output patterns instead of sed"),
     (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"),