cfg.py: perform incompatible opts check for user opts only
This commit is contained in:
parent
a09a6c6bbd
commit
5383c4b367
1 changed files with 2 additions and 1 deletions
|
|
@ -780,7 +780,8 @@ class Config(Lockable):
|
|||
|
||||
def _die_on_incompatible_opts(self):
|
||||
for group in self._incompatible_opts:
|
||||
bad = [k for k in self.__dict__ if k in group and getattr(self, k) is not None]
|
||||
bad = [k for k in self.__dict__
|
||||
if k in group and k in self._uopts and getattr(self, k) is not None]
|
||||
if len(bad) > 1:
|
||||
die(1, 'Conflicting options: {}'.format(', '.join(map(fmt_opt, bad))))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue