| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-04 07:09:35 +0000 (Tue, 04 Aug 2009) |
| 3 |
New Revision: 13891 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/emaint |
| 7 |
Log: |
| 8 |
Bug #280259 - Fix emaint to call binarytree._load_pkgindex() for unicode |
| 9 |
handling. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/emaint |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/emaint 2009-08-04 07:02:57 UTC (rev 13890) |
| 15 |
+++ main/trunk/bin/emaint 2009-08-04 07:09:35 UTC (rev 13891) |
| 16 |
@@ -116,13 +116,8 @@ |
| 17 |
myroot = portage.settings["ROOT"] |
| 18 |
self._bintree = portage.db[myroot]["bintree"] |
| 19 |
self._bintree.populate() |
| 20 |
- self._pkgindex_file = os.path.join(self._bintree.pkgdir, "Packages") |
| 21 |
- self._pkgindex = self._bintree._new_pkgindex() |
| 22 |
- f = open(self._pkgindex_file, 'r') |
| 23 |
- try: |
| 24 |
- self._pkgindex.read(f) |
| 25 |
- finally: |
| 26 |
- f.close() |
| 27 |
+ self._pkgindex_file = self._bintree._pkgindex_file |
| 28 |
+ self._pkgindex = self._bintree._load_pkgindex() |
| 29 |
|
| 30 |
def check(self, onProgress=None): |
| 31 |
missing = [] |
| 32 |
@@ -178,13 +173,8 @@ |
| 33 |
cpv_all = self._bintree.dbapi.cpv_all() |
| 34 |
cpv_all.sort() |
| 35 |
|
| 36 |
- pkgindex = bintree._new_pkgindex() |
| 37 |
+ pkgindex = bintree._load_pkgindex() |
| 38 |
self._pkgindex = pkgindex |
| 39 |
- f = open(self._pkgindex_file, 'r') |
| 40 |
- try: |
| 41 |
- self._pkgindex.read(f) |
| 42 |
- finally: |
| 43 |
- f.close() |
| 44 |
|
| 45 |
metadata = {} |
| 46 |
for d in pkgindex.packages: |
Archives