| 1 |
commit: 036b7211eb147422f7911c2c11a34a4046126135 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 1 09:58:50 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Dec 1 09:58:50 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=036b7211 |
| 7 |
|
| 8 |
Optimize out a common element for an early return. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 4 ++-- |
| 12 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index 622d288..343cc03 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -2276,10 +2276,11 @@ class depgraph(object): |
| 19 |
Don't ignore dependencies if pkg has a slot operator dependency on the child |
| 20 |
and the child has changed slot/sub_slot. |
| 21 |
""" |
| 22 |
+ if not mypriority.satisfied: |
| 23 |
+ return False |
| 24 |
slot_operator_rebuild = False |
| 25 |
if atom.slot_operator == '=' and \ |
| 26 |
(pkg.root, pkg.slot_atom) in self._dynamic_config._slot_operator_replace_installed and \ |
| 27 |
- mypriority.satisfied and \ |
| 28 |
mypriority.satisfied is not child and \ |
| 29 |
mypriority.satisfied.installed and \ |
| 30 |
not child.installed and \ |
| 31 |
@@ -2288,7 +2289,6 @@ class depgraph(object): |
| 32 |
|
| 33 |
return not atom.blocker and \ |
| 34 |
not recurse_satisfied and \ |
| 35 |
- mypriority.satisfied and \ |
| 36 |
mypriority.satisfied.visible and \ |
| 37 |
dep.child is not None and \ |
| 38 |
not dep.child.installed and \ |
Archives