summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Schepanovski <suor.web@gmail.com>2014-07-03 18:34:23 +0800
committerAlexander Schepanovski <suor.web@gmail.com>2014-07-03 18:34:23 +0800
commitfa48190fed81c28e393c162ef7189b7cc1f62332 (patch)
tree685300f7ea365ed3f8258d1c67220884db79e3bc
parentb445c4e81c404b991c7b643e206562ea0dc1f6b5 (diff)
downloadtox-fa48190fed81c28e393c162ef7189b7cc1f62332.tar.gz
Fix undefined env check
-rw-r--r--tox/_config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox/_config.py b/tox/_config.py
index 1dadc8a..0d9f8af 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -291,7 +291,7 @@ class parseini:
for name in all_envs:
section = testenvprefix + name
factors = set(name.split('-'))
- if section in self._cfg or factors & known_factors:
+ if section in self._cfg or factors <= known_factors:
config.envconfigs[name] = \
self._makeenvconfig(name, section, reader._subs, config)
@@ -305,7 +305,7 @@ class parseini:
factors = set()
if section in self._cfg:
for _, value in self._cfg[section].items():
- factors.update(re.findall(r'^(!)?(\w+)\:\s+(.+)', value))
+ factors.update(re.findall(r'^!?(\w+)\:\s+', value, re.M))
return factors
def _makeenvconfig(self, name, section, subs, config):