From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Jun 2011 02:37:45 +0000 (-0700)
Subject: autounmask: include comments from package.mask
X-Git-Tag: v2.2.0_alpha38~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61ee292b5976be4a7f0495cc1a5f4df75357bd03;p=portage.git

autounmask: include comments from package.mask

This will fix bug #369985.
---

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: