diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-08 10:05:20 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-08 10:05:20 -0700 |
| commit | c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95 (patch) | |
| tree | 252f5be1ccf856766bea22867573d81682a37341 /pym/_emerge/depgraph.py | |
| parent | 586760f37fb9784327d8447182d49810662f4427 (diff) | |
| download | portage-c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95.tar.gz portage-c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95.tar.bz2 portage-c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95.zip | |
autounmask-write: support package.accept_keywords
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 6 insertions, 1 deletions
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")] = \ |