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.77) (envelope-from ) id 1SmAlA-0004G0-Ms for garchives@archives.gentoo.org; Tue, 03 Jul 2012 21:35:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B343E02F0; Tue, 3 Jul 2012 21:35:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E7605E02F0 for ; Tue, 3 Jul 2012 21:35:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50F781B401D for ; Tue, 3 Jul 2012 21:35:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1852DE5436 for ; Tue, 3 Jul 2012 21:35:38 +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: <1341351319.9145dab7ffcc69a91b7f4a6378e991057d0daab7.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emaint X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9145dab7ffcc69a91b7f4a6378e991057d0daab7 X-VCS-Branch: master Date: Tue, 3 Jul 2012 21:35:38 +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: 39448b65-1b7b-439c-8e24-05376ede62ab X-Archives-Hash: 65cfd23379c6f6b6c6bf45c381ebff75 commit: 9145dab7ffcc69a91b7f4a6378e991057d0daab7 Author: Zac Medico gentoo org> AuthorDate: Tue Jul 3 21:35:19 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 3 21:35:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9145dab7 emaint: remove obsolete world category check The reason for this check, as discussed in bug #166785, is no longer relevant since emerge does not suggest to run `emaint --check world` in this case anymore. --- bin/emaint | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bin/emaint b/bin/emaint index 1bee0fe..cf2ccb8 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,5 +1,6 @@ #!/usr/bin/python -O -# vim: noet : +# Copyright 2005-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 =20 from __future__ import print_function =20 @@ -36,7 +37,6 @@ class WorldHandler(object): def __init__(self): self.invalid =3D [] self.not_installed =3D [] - self.invalid_category =3D [] self.okay =3D [] from portage._sets import load_default_config setconfig =3D load_default_config(portage.settings, @@ -44,7 +44,6 @@ class WorldHandler(object): self._sets =3D setconfig.getSets() =20 def _check_world(self, onProgress): - categories =3D set(portage.settings.categories) eroot =3D portage.settings['EROOT'] self.world_file =3D os.path.join(eroot, portage.const.WORLD_FILE) self.found =3D os.access(self.world_file, os.R_OK) @@ -73,9 +72,6 @@ class WorldHandler(object): if not vardb.match(atom): self.not_installed.append(atom) okay =3D False - if portage.catsplit(atom.cp)[0] not in categories: - self.invalid_category.append(atom) - okay =3D False if okay: self.okay.append(atom) if onProgress: @@ -87,7 +83,6 @@ class WorldHandler(object): if self.found: errors +=3D ["'%s' is not a valid atom" % x for x in self.invalid] errors +=3D ["'%s' is not installed" % x for x in self.not_installed] - errors +=3D ["'%s' has a category that is not listed in /etc/portage/= categories" % x for x in self.invalid_category] else: errors.append(self.world_file + " could not be opened for reading") return errors