From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 22 May 2006 09:05:46 +0000 (-0000)
Subject: Fix a bug that causes hashes of random types (mostly SHA1, from my experience) to... 
X-Git-Tag: v2.1_rc2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7e72aef9fe5f60a10c0eea89794d9b30d677feb;p=portage.git

Fix a bug that causes hashes of random types (mostly SHA1, from my experience) to be erroneously discarded due to dictionary assignment instead up update.

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

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index a59189e3d..e484d9e37 100644
--- a/pym/portage_manifest.py
+++ b/pym/portage_manifest.py
@@ -262,7 +262,7 @@ class Manifest(object):
 				if myname in self.fhashdict[mytype]:
 					myhashdict.setdefault(mytype, {})
 					myhashdict[mytype].setdefault(myname, {})
-					myhashdict[mytype][myname] = self.fhashdict[mytype][myname]
+					myhashdict[mytype][myname].update(self.fhashdict[mytype][myname])
 		return myhashdict
 
 	def _createDigestLines1(self, distlist, myhashdict):