diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-25 09:32:30 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-25 09:32:30 -0600 |
| commit | c7f73ebc2938e5dc67a10238cac9fc10f95e2f5f (patch) | |
| tree | f09c620b43306fc09aee0e0a37abffd772f2fa47 | |
| parent | ee07e7110d045eb6411ba101d2373318b5ab4f17 (diff) | |
| parent | 4c3a6b839b16ec30f2ef3160b3ab15925cc5f860 (diff) | |
| download | servo-c7f73ebc2938e5dc67a10238cac9fc10f95e2f5f.tar.gz servo-c7f73ebc2938e5dc67a10238cac9fc10f95e2f5f.zip | |
Auto merge of #6738 - mbrubeck:bootstrap, r=larsbergstrom
Perform argument validation before bootstrapping.
If there's an error in the command-line arguments for `mach build`, we should print it before starting a (potentially) long bootstrap process, not after.
r? @larsbergstrom or @frewsxcv
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6738)
<!-- Reviewable:end -->
| -rw-r--r-- | python/servo/build_commands.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index dd2fbb52c8e..12f0c909ddd 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -142,8 +142,6 @@ class MachCommands(CommandBase): help="Command-line arguments to be passed through to Cargo") def build(self, target=None, release=False, dev=False, jobs=None, android=None, verbose=False, debug_mozjs=False, params=None): - self.ensure_bootstrapped() - if android is None: android = self.config["build"]["android"] @@ -175,6 +173,8 @@ class MachCommands(CommandBase): print("Please specify either --dev or --release.") sys.exit(1) + self.ensure_bootstrapped() + if release: opts += ["--release"] if target: |