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 1PqS7J-0004YU-Gj for garchives@archives.gentoo.org; Fri, 18 Feb 2011 15:19:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4D471C026; Fri, 18 Feb 2011 15:19:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7118F1C026 for ; Fri, 18 Feb 2011 15:19:26 +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 F1D4C1B41F1 for ; Fri, 18 Feb 2011 15:19:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 612168006A for ; Fri, 18 Feb 2011 15:19:25 +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: <7867f86893b6f2c94f8e696428e1d4ab92923fd6.zmedico@gentoo> 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: 7867f86893b6f2c94f8e696428e1d4ab92923fd6 Date: Fri, 18 Feb 2011 15:19:25 +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: da81c17f61e5b5c4fb44ad4b9c579526 commit: 7867f86893b6f2c94f8e696428e1d4ab92923fd6 Author: Zac Medico gentoo org> AuthorDate: Fri Feb 18 15:15:15 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 18 15:15:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7867f868 unmerge: don't show null/ cat in unmatched atoms This will fix bug #269534. --- pym/_emerge/unmerge.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index e1d400f..df95f69 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from __future__ import print_function @@ -186,7 +186,7 @@ def unmerge(root_config, myopts, unmerge_action, mymatch =3D localtree.dep_match(x) if not mymatch: portage.writemsg("\n--- Couldn't find '%s' to %s.\n" % \ - (x, unmerge_action), noiselevel=3D-1) + (x.replace("null/", ""), unmerge_action), noiselevel=3D-1) continue =20 pkgmap.append(