merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 22 Apr 2008 14:36:24 -0700
changeset 2994 de48c60ad186
parent 2993 a975a534915c (current diff)
parent 2990 69ddc1c42130 (diff)
child 2997 caf9d364c6fc
child 3029 09fcdac092f7
merge with HEAD
--- a/wscript	Tue Apr 22 14:35:42 2008 -0700
+++ b/wscript	Tue Apr 22 14:36:24 2008 -0700
@@ -752,9 +752,11 @@
             _dir = os.getcwd()
             os.chdir(REGRESSION_TRACES_DIR_NAME)
             try:
-                os.system("hg pull " + REGRESSION_TRACES_REPO + REGRESSION_TRACES_DIR_NAME + " > /dev/null 2>&1")
+                result = os.system("hg -q pull %s && hg -q update" % (REGRESSION_TRACES_REPO + REGRESSION_TRACES_DIR_NAME))
             finally:
                 os.chdir("..")
+            if result:
+                Params.fatal("Synchronizing reference traces using Mercurial failed.")
     else:
         print "Synchronizing reference traces from web."
         urllib.urlretrieve(REGRESSION_TRACES_URL + REGRESSION_TRACES_TAR_NAME, REGRESSION_TRACES_TAR_NAME)