autounmask-write: support package.accept_keywords
authorZac Medico <zmedico@gentoo.org>
Wed, 8 Jun 2011 17:05:20 +0000 (10:05 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 8 Jun 2011 17:05:20 +0000 (10:05 -0700)
pym/_emerge/depgraph.py

index b9a394e5d75f5ae1af683e7621d1e2dd3ae89706..39179a4555aa4a6440ab6349b966ff94268fe047 100644 (file)
@@ -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")] = \