Исправлена обработка EMERGE_DEFAULT_OPTS

develop
Mike Khiretskiy 9 years ago
parent 9514151562
commit 105c060f6c

@ -107,15 +107,13 @@ class EmergeCommand(CommandExecutor):
self.child = None self.child = None
self.packages = packages self.packages = packages
self.params = self.default_params + extra_params self.params = self.default_params + extra_params
wrong_default_opts = ("--columns","--ask ", "--ask=")
if emerge_default_opts is None: if emerge_default_opts is None:
default_env = {'CLEAN_DELAY': '0'} default_env = {'CLEAN_DELAY': '0'}
else: else:
default_env = { default_env = {
'CLEAN_DELAY': '0', 'CLEAN_DELAY': '0',
'EMERGE_DEFAULT_OPTS': " ".join(filter( 'EMERGE_DEFAULT_OPTS': re.sub(r'(?:^|\s)(--columns)(?=\s|$)','',
lambda x: not any(y in x for y in wrong_default_opts), emerge_default_opts)
emerge_default_opts))
} }
default_env.update(os.environ) default_env.update(os.environ)
self.env = env or default_env self.env = env or default_env

Loading…
Cancel
Save