From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 Nov 2007 08:33:47 +0000 (-0000)
Subject: Return early from config.getMaskAtom() as soon as a matching
X-Git-Tag: v2.2_pre1~463
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f8224372d3ac2d3eb85e16077cdd52ad82f3bc7;p=portage.git

Return early from config.getMaskAtom() as soon as a matching
unmask atom is found.

svn path=/main/trunk/; revision=8379
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2295116da..96d6d7cfe 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1874,14 +1874,10 @@ class config(object):
 			for x in mask_atoms:
 				if not match_from_list(x, pkg_list):
 					continue
-				masked = True
 				if unmask_atoms:
 					for y in unmask_atoms:
 						if match_from_list(y, pkg_list):
-							masked = False
-							break
-				if not masked:
-					continue
+							return None
 				return x
 		return None