From 105c060f6cf611dd14232558ac537d96b98718b9 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Fri, 20 Mar 2015 13:18:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20EMERGE=5FDEFAULT=5FOPTS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/emerge_parser.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/update/emerge_parser.py b/pym/update/emerge_parser.py index 268c90b..50520fc 100644 --- a/pym/update/emerge_parser.py +++ b/pym/update/emerge_parser.py @@ -107,15 +107,13 @@ class EmergeCommand(CommandExecutor): self.child = None self.packages = packages self.params = self.default_params + extra_params - wrong_default_opts = ("--columns","--ask ", "--ask=") if emerge_default_opts is None: default_env = {'CLEAN_DELAY': '0'} else: default_env = { 'CLEAN_DELAY': '0', - 'EMERGE_DEFAULT_OPTS': " ".join(filter( - lambda x: not any(y in x for y in wrong_default_opts), - emerge_default_opts)) + 'EMERGE_DEFAULT_OPTS': re.sub(r'(?:^|\s)(--columns)(?=\s|$)','', + emerge_default_opts) } default_env.update(os.environ) self.env = env or default_env