From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-350503-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QSgkl-00033S-7S
for garchives@archives.gentoo.org; Sat, 04 Jun 2011 02:38:19 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F16FA1C025;
Sat, 4 Jun 2011 02:38:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id C1A0D1C025
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 02:38:09 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 026AD1BC002
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 02:38:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 21EF680506
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jun 2011 02:38:08 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <61ee292b5976be4a7f0495cc1a5f4df75357bd03.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/_emerge/depgraph.py
X-VCS-Directories: pym/_emerge/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 61ee292b5976be4a7f0495cc1a5f4df75357bd03
Date: Sat, 4 Jun 2011 02:38:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: c6bfd2ea8f02e2ae8f28f8bd561db132
commit: 61ee292b5976be4a7f0495cc1a5f4df75357bd03
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 02:37:45 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 02:37:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D61ee292b
autounmask: include comments from package.mask
This will fix bug #369985.
---
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 0b4be4f..64fe9c9 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5662,7 +5662,20 @@ class depgraph(object):
reason.unmask_hint.key =3D=3D 'p_mask':
keyword =3D reason.unmask_hint.value
=20
+ comment, filename =3D portage.getmaskingreason(
+ pkg.cpv, metadata=3Dpkg.metadata,
+ settings=3Dpkgsettings,
+ portdb=3Dpkg.root_config.trees["porttree"].dbapi,
+ return_location=3DTrue)
+
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 =3D [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(">=3D%s\n" % pkg.cpv)
elif is_latest_in_slot: