Rev 5401: Merge vila's bug #626667 fix, add -f to the RM for set -e to not fail. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 5401 [merge]
revision-id: john at arbash-meinel.com-20100830212313-n4uvz6su15w3dlpt
parent: john at arbash-meinel.com-20100830211955-g93k3c3u5kft8z02
parent: v.ladeuil+lp at free.fr-20100830101421-0k1uddicm7j5cgox
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2010-08-30 16:23:13 -0500
message:
  Merge vila's bug #626667 fix, add -f to the RM for set -e to not fail.
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2010-08-30 19:18:35 +0000
+++ b/Makefile	2010-08-30 21:23:13 +0000
@@ -41,7 +41,12 @@
 check-nodocs: extensions
 	set -e
 	# Generate a stream for PQM to watch.
+	-$(RM) -f selftest.log
 	$(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
+	# An empty log file should catch errors in the $(PYTHON)
+	# command above (the '|' swallow any errors since 'make'
+	# sees the 'tee' exit code for the whole line
+	if [ ! -s selftest.log ] ; then exit 1 ; fi
 	# Check that there were no errors reported.
 	subunit-stats < selftest.log
 	false

=== modified file 'NEWS'
--- a/NEWS	2010-08-30 07:47:38 +0000
+++ b/NEWS	2010-08-30 10:14:21 +0000
@@ -128,6 +128,9 @@
 * `PathNotChild` should not give a traceback.
   (Martin Pool, #98735)
 
+* ``PQM`` will no longer ignore syntax errors in submissions.
+  (Vincent Ladeuil, #626667)
+
 * Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
   which can result in "missing referenced chk root keys" errors when
   fetching from repositories with affected revisions.