| 1 |
commit: 9145dab7ffcc69a91b7f4a6378e991057d0daab7 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 3 21:35:19 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 3 21:35:19 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9145dab7 |
| 7 |
|
| 8 |
emaint: remove obsolete world category check |
| 9 |
|
| 10 |
The reason for this check, as discussed in bug #166785, is no longer |
| 11 |
relevant since emerge does not suggest to run `emaint --check world` in |
| 12 |
this case anymore. |
| 13 |
|
| 14 |
--- |
| 15 |
bin/emaint | 9 ++------- |
| 16 |
1 files changed, 2 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/bin/emaint b/bin/emaint |
| 19 |
index 1bee0fe..cf2ccb8 100755 |
| 20 |
--- a/bin/emaint |
| 21 |
+++ b/bin/emaint |
| 22 |
@@ -1,5 +1,6 @@ |
| 23 |
#!/usr/bin/python -O |
| 24 |
-# vim: noet : |
| 25 |
+# Copyright 2005-2012 Gentoo Foundation |
| 26 |
+# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
from __future__ import print_function |
| 29 |
|
| 30 |
@@ -36,7 +37,6 @@ class WorldHandler(object): |
| 31 |
def __init__(self): |
| 32 |
self.invalid = [] |
| 33 |
self.not_installed = [] |
| 34 |
- self.invalid_category = [] |
| 35 |
self.okay = [] |
| 36 |
from portage._sets import load_default_config |
| 37 |
setconfig = load_default_config(portage.settings, |
| 38 |
@@ -44,7 +44,6 @@ class WorldHandler(object): |
| 39 |
self._sets = setconfig.getSets() |
| 40 |
|
| 41 |
def _check_world(self, onProgress): |
| 42 |
- categories = set(portage.settings.categories) |
| 43 |
eroot = portage.settings['EROOT'] |
| 44 |
self.world_file = os.path.join(eroot, portage.const.WORLD_FILE) |
| 45 |
self.found = os.access(self.world_file, os.R_OK) |
| 46 |
@@ -73,9 +72,6 @@ class WorldHandler(object): |
| 47 |
if not vardb.match(atom): |
| 48 |
self.not_installed.append(atom) |
| 49 |
okay = False |
| 50 |
- if portage.catsplit(atom.cp)[0] not in categories: |
| 51 |
- self.invalid_category.append(atom) |
| 52 |
- okay = False |
| 53 |
if okay: |
| 54 |
self.okay.append(atom) |
| 55 |
if onProgress: |
| 56 |
@@ -87,7 +83,6 @@ class WorldHandler(object): |
| 57 |
if self.found: |
| 58 |
errors += ["'%s' is not a valid atom" % x for x in self.invalid] |
| 59 |
errors += ["'%s' is not installed" % x for x in self.not_installed] |
| 60 |
- errors += ["'%s' has a category that is not listed in /etc/portage/categories" % x for x in self.invalid_category] |
| 61 |
else: |
| 62 |
errors.append(self.world_file + " could not be opened for reading") |
| 63 |
return errors |
Archives