From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6ADB7138247 for ; Sun, 1 Dec 2013 10:19:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D78CBE0964; Sun, 1 Dec 2013 10:19:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 655A7E0964 for ; Sun, 1 Dec 2013 10:19:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 625C433F3BB for ; Sun, 1 Dec 2013 10:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1C483E5534 for ; Sun, 1 Dec 2013 10:19:41 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1385891930.036b7211eb147422f7911c2c11a34a4046126135.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 036b7211eb147422f7911c2c11a34a4046126135 X-VCS-Branch: master Date: Sun, 1 Dec 2013 10:19:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a1dab15d-2f2e-4cc0-9122-f8b27028bcf2 X-Archives-Hash: fb629d4d831f744f9a8c62c1f1d76564 commit: 036b7211eb147422f7911c2c11a34a4046126135 Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 1 09:58:50 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Dec 1 09:58:50 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=036b7211 Optimize out a common element for an early return. --- pym/_emerge/depgraph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 622d288..343cc03 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2276,10 +2276,11 @@ class depgraph(object): Don't ignore dependencies if pkg has a slot operator dependency on the child and the child has changed slot/sub_slot. """ + if not mypriority.satisfied: + return False slot_operator_rebuild = False if atom.slot_operator == '=' and \ (pkg.root, pkg.slot_atom) in self._dynamic_config._slot_operator_replace_installed and \ - mypriority.satisfied and \ mypriority.satisfied is not child and \ mypriority.satisfied.installed and \ not child.installed and \ @@ -2288,7 +2289,6 @@ class depgraph(object): return not atom.blocker and \ not recurse_satisfied and \ - mypriority.satisfied and \ mypriority.satisfied.visible and \ dep.child is not None and \ not dep.child.installed and \