merge with HEAD

2008-04-22 14:36:24 -07:00
parent 63d6b14d45 eb9fa68703
commit 28bf2500e9
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@@ -752,9 +752,11 @@ def run_regression():
            _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)