aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-04 07:09:35 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-04 07:09:35 +0000
commit34f9b9553c00affb83f0423f37400b3cfc648694 (patch)
tree7be686e2ce8d0e7763b887876d3197034f7bb82c /bin/emaint
parentBug #280259 - Fix binarytree to always open the Packages file as unicode. (diff)
downloadportage-34f9b9553c00affb83f0423f37400b3cfc648694.tar.gz
portage-34f9b9553c00affb83f0423f37400b3cfc648694.tar.bz2
portage-34f9b9553c00affb83f0423f37400b3cfc648694.zip
Bug #280259 - Fix emaint to call binarytree._load_pkgindex() for unicode
handling. svn path=/main/trunk/; revision=13891
Diffstat (limited to 'bin/emaint')
-rwxr-xr-xbin/emaint16
1 files changed, 3 insertions, 13 deletions
diff --git a/bin/emaint b/bin/emaint
index 0d053d7fb..0bfc88de5 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -116,13 +116,8 @@ class BinhostHandler(object):
myroot = portage.settings["ROOT"]
self._bintree = portage.db[myroot]["bintree"]
self._bintree.populate()
- self._pkgindex_file = os.path.join(self._bintree.pkgdir, "Packages")
- self._pkgindex = self._bintree._new_pkgindex()
- f = open(self._pkgindex_file, 'r')
- try:
- self._pkgindex.read(f)
- finally:
- f.close()
+ self._pkgindex_file = self._bintree._pkgindex_file
+ self._pkgindex = self._bintree._load_pkgindex()
def check(self, onProgress=None):
missing = []
@@ -178,13 +173,8 @@ class BinhostHandler(object):
cpv_all = self._bintree.dbapi.cpv_all()
cpv_all.sort()
- pkgindex = bintree._new_pkgindex()
+ pkgindex = bintree._load_pkgindex()
self._pkgindex = pkgindex
- f = open(self._pkgindex_file, 'r')
- try:
- self._pkgindex.read(f)
- finally:
- f.close()
metadata = {}
for d in pkgindex.packages: