Bug #280259 - Fix emaint to call binarytree._load_pkgindex() for unicode

handling.

svn path=/main/trunk/; revision=13891

diff --git a/bin/emaint b/bin/emaint
index 0d053d7fbdd9e01d0323d3f391e37353b8abcbe2..0bfc88de5d91c3f789466e3af65c74fa8dca8a3c 100755 (executable)
--- 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: