diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-03 19:37:45 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-03 19:37:45 -0700 |
| commit | 61ee292b5976be4a7f0495cc1a5f4df75357bd03 (patch) | |
| tree | 6d8910050935d3458154fd8a92a8aeb46e450f82 | |
| parent | 79df84ecdc66097a8ac18e42f97f615d5f8ed2d0 (diff) | |
| download | portage-61ee292b5976be4a7f0495cc1a5f4df75357bd03.tar.gz portage-61ee292b5976be4a7f0495cc1a5f4df75357bd03.tar.bz2 portage-61ee292b5976be4a7f0495cc1a5f4df75357bd03.zip | |
autounmask: include comments from package.mask
This will fix bug #369985.
| -rw-r--r-- | pym/_emerge/depgraph.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 0b4be4f7f..64fe9c917 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5662,7 +5662,20 @@ class depgraph(object): reason.unmask_hint.key == 'p_mask': keyword = reason.unmask_hint.value + comment, filename = portage.getmaskingreason( + pkg.cpv, metadata=pkg.metadata, + settings=pkgsettings, + portdb=pkg.root_config.trees["porttree"].dbapi, + return_location=True) + p_mask_change_msg[root].append(self._get_dep_chain_as_comment(pkg)) + if filename: + p_mask_change_msg[root].append("# %s:\n" % filename) + if comment: + comment = [line for line in + comment.splitlines() if line] + for line in comment: + p_mask_change_msg[root].append("%s\n" % line) if is_latest: p_mask_change_msg[root].append(">=%s\n" % pkg.cpv) elif is_latest_in_slot: |