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

Bug 1256571 - Delay resolving the reason for an implied option. r=chmanchester

Browse Source
This commit is contained in:
Mike Hommey 2016-04-08 15:57:33 +09:00
parent 56bbf297c7
commit dd20a01b39
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/mozbuild/mozbuild/configure/__init__.py
View File

@ -297,6 +297,7 @@ class ConfigureSandbox(dict):
value, option_string = self._helper.handle(option)
except ConflictingOptionError as e:
frameinfo, reason = self._implied_options[e.arg]
reason = self._raw_options.get(reason) or reason.option
raise InvalidOptionError(
"'%s' implied by '%s' conflicts with '%s' from the %s"
% (e.arg, reason, e.old_arg, e.old_origin))
@ -591,8 +592,7 @@ class ConfigureSandbox(dict):
possible_reasons = [d for d in deps if d != self._help_option]
if len(possible_reasons) == 1:
if isinstance(possible_reasons[0], Option):
reason = (self._raw_options.get(possible_reasons[0]) or
possible_reasons[0].option)
reason = possible_reasons[0]
if not reason:
raise ConfigureError(