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 ) id 1QUPJ9-00071F-Kx for garchives@archives.gentoo.org; Wed, 08 Jun 2011 20:24:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B3E81C0D9; Wed, 8 Jun 2011 20:24:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 23AEA1C0D9 for ; Wed, 8 Jun 2011 20:24:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9717F1B401F for ; Wed, 8 Jun 2011 20:24:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B5D408003C for ; Wed, 8 Jun 2011 20:24:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/unmerge.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ac01d2898ece4589cdaa971382cc1dc17261ed58 Date: Wed, 8 Jun 2011 20:24:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 24ba44e0d9ea7afb5306d52e24d2382c commit: ac01d2898ece4589cdaa971382cc1dc17261ed58 Author: Zac Medico gentoo org> AuthorDate: Wed Jun 8 20:24:26 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 8 20:24:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dac01d289 unmerge: show virtual in system unmerge warning This is intended to clarify the messages shown in bug #370295, so that it's obvious when a package is a member of the system set due to it being a virtual provider. --- pym/_emerge/unmerge.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 38f3515..3db3a8b 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -61,10 +61,13 @@ def _unmerge_display(root_config, myopts, unmerge_act= ion, vdb_lock =3D True =20 realsyslist =3D [] + sys_virt_map =3D {} for x in sets["system"].getAtoms(): for atom in expand_new_virt(vartree.dbapi, x): if not atom.blocker: realsyslist.append(atom) + if atom.cp !=3D x.cp: + sys_virt_map[atom.cp] =3D x.cp =20 syslist =3D [] for x in realsyslist: @@ -442,8 +445,13 @@ def _unmerge_display(root_config, myopts, unmerge_ac= tion, #avoid cluttering the preview printout with stuff that isn't getting = unmerged continue if not (pkgmap[x]["protected"] or pkgmap[x]["omitted"]) and cp in sysl= ist: + virt_cp =3D sys_virt_map.get(cp) + if virt_cp is None: + cp_info =3D "'%s'" % (cp,) + else: + cp_info =3D "'%s' (%s)" % (cp, virt_cp) writemsg_level(colorize("BAD","\n\n!!! " + \ - "'%s' is part of your system profile.\n" % cp), + "%s is part of your system profile.\n" % (cp_info,)), level=3Dlogging.WARNING, noiselevel=3D-1) writemsg_level(colorize("WARN","!!! Unmerging it may " + \ "be damaging to your system.\n\n"),