diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-17 00:10:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-17 00:10:21 -0700 |
| commit | da3cdf8a6ffd5cd69587291d75d19f1deb0e5976 (patch) | |
| tree | e6dee5dd3065f37c169fe2546397486b661c934e /pym/_emerge/depgraph.py | |
| parent | a6ea5746a7837e555a0a590a232f8ecdaf03fd89 (diff) | |
| download | portage-da3cdf8a6ffd5cd69587291d75d19f1deb0e5976.tar.gz portage-da3cdf8a6ffd5cd69587291d75d19f1deb0e5976.tar.bz2 portage-da3cdf8a6ffd5cd69587291d75d19f1deb0e5976.zip | |
--autounmask-write: use CONFIGROOT and EROOT
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9f3c1ac71..a2b953448 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5714,7 +5714,9 @@ class depgraph(object): problems = [] if write_to_file: for root in roots: - abs_user_config = os.path.join(root, USER_CONFIG_PATH) + settings = self._frozen_config.roots[root].settings + abs_user_config = os.path.join( + settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) if root in unstable_keyword_msg: file_to_write_to[(abs_user_config, "package.keywords")] = \ @@ -5739,7 +5741,10 @@ class depgraph(object): write_to_file = not problems for root in roots: - abs_user_config = os.path.join(root, USER_CONFIG_PATH) + settings = self._frozen_config.roots[root].settings + abs_user_config = os.path.join( + settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) + if len(roots) > 1: writemsg_stdout("\nFor %s:\n" % abs_user_config, noiselevel=-1) @@ -5766,8 +5771,8 @@ class depgraph(object): protect_obj = {} if write_to_file: for root in roots: - settings = self._frozen_config.pkgsettings[root] - protect_obj[root] = ConfigProtect(root, \ + settings = self._frozen_config.roots[root].settings + protect_obj[root] = ConfigProtect(settings["EROOT"], \ shlex_split(settings.get("CONFIG_PROTECT", "")), shlex_split(settings.get("CONFIG_PROTECT_MASK", ""))) |