Spew less when script/bootstrap fails

This commit is contained in:
Adam Roben 2013-08-06 16:36:58 -04:00
parent a61fa01c5d
commit 6841801538

View file

@ -14,8 +14,8 @@ DOWNLOAD_DIR = os.path.join(VENDOR_DIR, 'download')
def main(): def main():
args = parse_args() args = parse_args()
update_submodules() return (update_submodules() or
download_libchromiumcontent(args.url) download_libchromiumcontent(args.url))
def parse_args(): def parse_args():
@ -27,17 +27,17 @@ def parse_args():
def update_submodules(): def update_submodules():
subprocess.check_call(['git', 'submodule', 'sync', '--quiet']) return (subprocess.call(['git', 'submodule', 'sync', '--quiet']) or
subprocess.check_call(['git', 'submodule', 'update', '--init', subprocess.call(['git', 'submodule', 'update', '--init',
'--recursive']) '--recursive']))
def download_libchromiumcontent(url): def download_libchromiumcontent(url):
mkdir_p(DOWNLOAD_DIR) mkdir_p(DOWNLOAD_DIR)
download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script', download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script',
'download') 'download')
subprocess.check_call([sys.executable, download, '-f', url, return subprocess.call([sys.executable, download, '-f', url,
os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')]) os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')])
def mkdir_p(path): def mkdir_p(path):