Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1361003 - Use check_call when calling "mach vendor rust". r=ted

Browse Source 
As mozprocess doesn't have any special handling of stderr, should cargo
operations fail their output is dropped.  Switch to subprocess.check_call to
ensure cargo errors are displayed to the caller.
This commit is contained in:
byron jones 2017-06-22 13:52:38 +08:00
parent 7836b08caf
commit c191b98031
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/mozbuild/mozbuild/vendor_rust.py
View File

@ -275,9 +275,10 @@ license file's hash.
) )
for (lib, crate_root) in crates_and_roots: for (lib, crate_root) in crates_and_roots:
path = mozpath.join(self.topsrcdir, crate_root) path = mozpath.join(self.topsrcdir, crate_root)
# We use check_call instead of mozprocess to ensure errors are displayed.
# We do an |update -p| here to regenerate the Cargo.lock file with minimal changes. See bug 1324462 # We do an |update -p| here to regenerate the Cargo.lock file with minimal changes. See bug 1324462
self._run_command_in_srcdir(args=[cargo, 'update', '--manifest-path', mozpath.join(path, 'Cargo.toml'), '-p', lib]) subprocess.check_call([cargo, 'update', '--manifest-path', mozpath.join(path, 'Cargo.toml'), '-p', lib], cwd=self.topsrcdir)
self._run_command_in_srcdir(args=[cargo, 'vendor', '--no-delete', '--sync', mozpath.join(path, 'Cargo.lock'), vendor_dir]) subprocess.check_call([cargo, 'vendor', '--quiet', '--no-delete', '--sync', mozpath.join(path, 'Cargo.lock'), vendor_dir], cwd=self.topsrcdir)
if not self._check_licenses(vendor_dir): if not self._check_licenses(vendor_dir):
self.log(logging.ERROR, 'license_check_failed', {}, self.log(logging.ERROR, 'license_check_failed', {},