From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 30 Jan 2010 14:31:53 +0000 (-0000)
Subject: Fix concatenation of list + tuple in Manifest._createManifestEntries().
X-Git-Tag: v2.2_rc63~103
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4e18a443266fc0e4f8a4ec6ad5154eb82ed5b4b;p=portage.git

Fix concatenation of list + tuple in Manifest._createManifestEntries().

svn path=/main/trunk/; revision=15289
---

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