Commit 60c128b9 authored by Jérome Perrin's avatar Jérome Perrin

Use subprocess.check_call, which will display error message

parent 04479bf2
import errno import errno
import os import os
import subprocess
import shutil import shutil
import signal import signal
import socket import socket
...@@ -46,9 +47,8 @@ if save_mysql: ...@@ -46,9 +47,8 @@ if save_mysql:
# faster, so this produce somewhat not nice to read sql # faster, so this produce somewhat not nice to read sql
command = 'mysqldump %s > %s' % (getMySQLArguments(), dump_sql_path,) command = 'mysqldump %s > %s' % (getMySQLArguments(), dump_sql_path,)
if verbosity: if verbosity:
_print('Dumping MySQL database with %s...' % command) _print('Dumping MySQL database with %s ...' % command)
ret = os.system(command) subprocess.check_call(command, shell=True)
assert not ret
_print("Cleaning static files ... ") _print("Cleaning static files ... ")
for static_dir in static_dir_list: for static_dir in static_dir_list:
...@@ -61,9 +61,9 @@ for static_dir in static_dir_list: ...@@ -61,9 +61,9 @@ for static_dir in static_dir_list:
if load: if load:
if save_mysql: if save_mysql:
if os.path.exists(dump_sql_path): if os.path.exists(dump_sql_path):
_print("Restoring MySQL database ... ") command = "mysql %s < %s" % (getMySQLArguments(), dump_sql_path)
ret = os.system("mysql %s < %s" % (getMySQLArguments(), dump_sql_path)) _print("Restoring MySQL database with %s ... " % command)
assert not ret subprocess.check_call(command, shell=True)
else: else:
_print("Could not find MySQL dump (%r), will recreate catalog ... " % dump_sql_path) _print("Could not find MySQL dump (%r), will recreate catalog ... " % dump_sql_path)
os.environ['erp5_tests_recreate_catalog'] = '1' os.environ['erp5_tests_recreate_catalog'] = '1'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment