diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-30 08:50:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-30 08:50:44 +0000 |
| commit | 8662c0dbe2e7d2f992173d071850bac3ad84ef91 (patch) | |
| tree | 84998ed7e9cbc9e2e7c228884afbb68c8be71672 /pym/portage.py | |
| parent | 6e52d2b622e089e9dfc3eb814e4bba3e670cae83 (diff) | |
| download | portage-8662c0dbe2e7d2f992173d071850bac3ad84ef91.tar.gz portage-8662c0dbe2e7d2f992173d071850bac3ad84ef91.tar.bz2 portage-8662c0dbe2e7d2f992173d071850bac3ad84ef91.zip | |
* Fix dep_check() so that it doesn't expand virtual blockers since the
un-expanded virtual atom is more useful for maintaining a cache of
blocker atoms.
* Expand virtual blockers in depgraph.validate_blockers(), since it's
not done by dep_check() anymore.
* If blocker data from the graph is available, use it to validate the
blocker cache and update the cache if it seems invalid.
* Make BlockerCache._load() more tolerant to installs/uninstalls so
so that cache isn't rebuilt so often.
(trunk r10040:10043)
svn path=/main/branches/2.1.2/; revision=10044
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index 6944fea9a..61f82698e 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5368,6 +5368,12 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", continue mychoices = myvirtuals.get(mykey, []) isblocker = x.startswith("!") + if isblocker: + # Virtual blockers are no longer expanded here since + # the un-expanded virtual atom is more useful for + # maintaining a cache of blocker atoms. + newsplit.append(x) + continue match_atom = x if isblocker: match_atom = x[1:] |