From cb75d06bf60016d26a4f7bd2c7e6a55d66194309 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 19 Nov 2010 15:21:53 -0800 Subject: Handle combination of incremental + USE_EXPAND This fixes a corner case in the code from the previous commit. --- pym/portage/package/ebuild/config.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 33b57c5ba..a84e8fe84 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1787,8 +1787,15 @@ class config(object): if v is None: continue prefix = k.lower() + '_' - for x in v.split(): - expand_use.append(prefix + x) + if k in myincrementals: + for x in v.split(): + if x[:1] == '-': + expand_use.append('-' + prefix + x[1:]) + else: + expand_use.append(prefix + x) + else: + for x in v.split(): + expand_use.append(prefix + x) if expand_use: expand_use.append(use) use = ' '.join(expand_use) -- cgit v1.2.3-1-g7c22