summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-01-30 14:31:53 +0000
committerZac Medico <zmedico@gentoo.org>2010-01-30 14:31:53 +0000
commita4e18a443266fc0e4f8a4ec6ad5154eb82ed5b4b (patch)
tree9a89f8187be135fd420d812931aa6f578a3995a9
parent6bb8256f0505ed2c5437ca7733f656ca57bb4ac5 (diff)
downloadportage-a4e18a443266fc0e4f8a4ec6ad5154eb82ed5b4b.tar.gz
portage-a4e18a443266fc0e4f8a4ec6ad5154eb82ed5b4b.tar.bz2
portage-a4e18a443266fc0e4f8a4ec6ad5154eb82ed5b4b.zip
Fix concatenation of list + tuple in Manifest._createManifestEntries().
svn path=/main/trunk/; revision=15289
-rw-r--r--pym/portage/manifest.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index fc8afb4cf..470f732d6 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -205,6 +205,8 @@ class Manifest(object):
return myhashdict
def _createManifestEntries(self):
+ valid_hashes = set(portage.const.MANIFEST2_HASH_FUNCTIONS)
+ valid_hashes.add('size')
mytypes = list(self.fhashdict)
mytypes.sort()
for t in mytypes:
@@ -213,10 +215,8 @@ class Manifest(object):
for f in myfiles:
myentry = Manifest2Entry(
type=t, name=f, hashes=self.fhashdict[t][f].copy())
- myhashkeys = list(myentry.hashes)
- myhashkeys.sort()
- for h in myhashkeys:
- if h not in ["size"] + portage.const.MANIFEST2_HASH_FUNCTIONS:
+ for h in list(myentry.hashes):
+ if h not in valid_hashes:
del myentry.hashes[h]
yield myentry