From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Aug 2010 19:27:05 +0000 (-0700)
Subject: Move default ACCEPT_KEYWORDS handling for package.keywords out of
X-Git-Tag: v2.2_rc68~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b3799269ad8c7ec8f8f307a6e41b5550517a36a;p=portage.git

Move default ACCEPT_KEYWORDS handling for package.keywords out of
an unnecessary loop.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 572effd51..095957918 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1021,19 +1021,14 @@ class config(object):
 					recursive=1, allow_wildcard=True).items():
 					pkgdict.setdefault(k, []).extend(v)
 
+				accept_keywords_defaults = \
+					self.configdict["defaults"].get("ACCEPT_KEYWORDS", "").split()
+				accept_keywords_defaults = tuple('~' + keyword for keyword in \
+					accept_keywords_defaults if keyword[:1] not in "~-")
 				for k, v in pkgdict.items():
 					# default to ~arch if no specific keyword is given
 					if not v:
-						mykeywordlist = []
-						if self.configdict["defaults"] and \
-							"ACCEPT_KEYWORDS" in self.configdict["defaults"]:
-							groups = self.configdict["defaults"]["ACCEPT_KEYWORDS"].split()
-						else:
-							groups = []
-						for keyword in groups:
-							if not keyword[0] in "~-":
-								mykeywordlist.append("~"+keyword)
-						v = mykeywordlist
+						v = accept_keywords_defaults
 					self.pkeywordsdict.setdefault(k.cp, {})[k] = v
 
 				#package.license