From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 8 Jun 2011 17:05:20 +0000 (-0700)
Subject: autounmask-write: support package.accept_keywords
X-Git-Tag: v2.2.0_alpha39~23
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95;p=portage.git

autounmask-write: support package.accept_keywords
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index b9a394e5d..39179a455 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5786,8 +5786,13 @@ class depgraph(object):
 					settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH)
 
 				if root in unstable_keyword_msg:
+					if os.path.exists(os.path.join(abs_user_config,
+						"package.accept_keywords")):
+						filename = "package.accept_keywords"
+					else:
+						filename = "package.keywords"
 					file_to_write_to[(abs_user_config, "package.keywords")] = \
-						find_config_file(abs_user_config, "package.keywords")
+						find_config_file(abs_user_config, filename)
 
 				if root in p_mask_change_msg:
 					file_to_write_to[(abs_user_config, "package.unmask")] = \