diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-12 01:58:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-12 01:58:23 +0000 |
| commit | f9dc49ffd4486777e96b2e045c0b4523c479fef4 (patch) | |
| tree | c9f7e3cebc5e33fa8ebfca09acc7f4d7f87f53ba /pym/_emerge/__init__.py | |
| parent | 36f15d83c7d65976cde18dd08cf792b949e2334b (diff) | |
| download | portage-f9dc49ffd4486777e96b2e045c0b4523c479fef4.tar.gz portage-f9dc49ffd4486777e96b2e045c0b4523c479fef4.tar.bz2 portage-f9dc49ffd4486777e96b2e045c0b4523c479fef4.zip | |
* Add a digraph.get() method, analogous to dict.get(), used to simplify
Scheduler._pkg().
* Define digraph.__contains__ for containment tests via the "in" operator.
svn path=/main/trunk/; revision=11021
Diffstat (limited to 'pym/_emerge/__init__.py')
| -rw-r--r-- | pym/_emerge/__init__.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 5dbb44795..38f485aae 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8732,12 +8732,9 @@ class Scheduler(PollLoop): settings.setcpv(pkg) pkg.metadata["USE"] = settings["PORTAGE_USE"] - if self._digraph and \ - self._digraph.contains(pkg): - for existing_instance in self._digraph.order: - if existing_instance == pkg: - pkg = existing_instance - break + if self._digraph is not None: + # Reuse existing instance when available. + pkg = self._digraph.get(pkg, pkg) return pkg |