diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-19 15:21:53 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-23 18:06:01 -0800 |
| commit | cb75d06bf60016d26a4f7bd2c7e6a55d66194309 (patch) | |
| tree | 754e5bfdbc90f13394b37b9a7fda8700f4af0877 /pym | |
| parent | 87da6752e50fd7658b53afb0fa2bd32b0d3ed64d (diff) | |
| download | portage-cb75d06bf60016d26a4f7bd2c7e6a55d66194309.tar.gz portage-cb75d06bf60016d26a4f7bd2c7e6a55d66194309.tar.bz2 portage-cb75d06bf60016d26a4f7bd2c7e6a55d66194309.zip | |
Handle combination of incremental + USE_EXPAND
This fixes a corner case in the code from the previous commit.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 11 |
1 files 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) |