diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-23 10:38:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-23 10:38:49 -0700 |
| commit | d8baf4d71a1cb54749b2d0ea2e55ea8adb4bd50f (patch) | |
| tree | 65e585e3f70ede3f7daa35a28f26b12b1363a652 /pym/_emerge | |
| parent | c8e6365da46d6b7165188de9d9831a46d23c6645 (diff) | |
| download | portage-d8baf4d71a1cb54749b2d0ea2e55ea8adb4bd50f.tar.gz portage-d8baf4d71a1cb54749b2d0ea2e55ea8adb4bd50f.tar.bz2 portage-d8baf4d71a1cb54749b2d0ea2e55ea8adb4bd50f.zip | |
Pass a keyword hint from getmaskingstatus() to the autounmask code.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f9b581e0e..2173d1031 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2429,7 +2429,8 @@ class depgraph(object): root_config = self._frozen_config.roots[pkg.root] mreasons = _get_masking_status(pkg, pkgsettings, root_config, use=self._pkg_use_enabled(pkg)) if len(mreasons) == 1 and \ - mreasons[0].hint == 'unstable keyword': + mreasons[0].unmask_hint and \ + mreasons[0].unmask_hint.key == 'unstable keyword': return True else: return False @@ -5196,8 +5197,16 @@ class depgraph(object): self._show_merge_list() if pkg in self._dynamic_config.digraph.nodes.keys(): pkgsettings = self._frozen_config.pkgsettings[pkg.root] + mreasons = _get_masking_status(pkg, pkgsettings, pkg.root_config, + use=self._pkg_use_enabled(pkg)) + if len(mreasons) == 1 and \ + mreasons[0].unmask_hint and \ + mreasons[0].unmask_hint.key == 'unstable keyword': + keyword = mreasons[0].unmask_hint.value + else: + keyword = '~' + pkgsettings.get('ARCH', '*') unstable_keyword_msg.append(get_dep_chain(pkg)) - unstable_keyword_msg.append("=%s ~%s\n" % (pkg.cpv, pkgsettings["ACCEPT_KEYWORDS"])) + unstable_keyword_msg.append("=%s %s\n" % (pkg.cpv, keyword)) use_changes_msg = [] for pkg, needed_use_config_change in self._dynamic_config._needed_use_config_changes.items(): |