summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2006-01-22 21:26:19 +0000
committerMarius Mauch <genone@gentoo.org>2006-01-22 21:26:19 +0000
commitb28e96561e17281937ca62c1f904f8ef3f64d54e (patch)
treedae5d321f36fc6bcb03b1a33598873631a23dadd
parent18857e5b06f9405f9f25df66eb00ef9a53ec5b82 (diff)
downloadportage-b28e96561e17281937ca62c1f904f8ef3f64d54e.tar.gz
portage-b28e96561e17281937ca62c1f904f8ef3f64d54e.tar.bz2
portage-b28e96561e17281937ca62c1f904f8ef3f64d54e.zip
fixup
svn path=/main/trunk/; revision=2569
-rwxr-xr-xbin/emaint2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/emaint b/bin/emaint
index be538033d..803b5a726 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -49,7 +49,6 @@ class VdbKeyHandler(object):
return "vdbkeys"
name = staticmethod(name)
-<<<<<<< .mine
def __init__(self):
self.list = portage.db["/"]["vartree"].dbapi.cpv_all()
self.missing = []
@@ -101,6 +100,7 @@ class VdbKeyHandler(object):
keyfile.close()
return errors
+
# this sucks, should track this in a different manner.
modules = {"world" : WorldHandler,
"vdbkeys": VdbKeyHandler}