summaryrefslogtreecommitdiffstats
path: root/pym/portage/manifest.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/manifest.py')
-rw-r--r--pym/portage/manifest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 08ac13932..732d403f8 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -473,6 +473,9 @@ class Manifest(object):
# repoman passes in an empty list, which implies that all distfiles
# are required.
requiredDistfiles = distlist.copy()
+ required_hash_types = set()
+ required_hash_types.add("size")
+ required_hash_types.add(portage.const.MANIFEST2_REQUIRED_HASH)
for f in distlist:
fname = os.path.join(self.distdir, f)
mystat = None
@@ -486,7 +489,7 @@ class Manifest(object):
(assumeDistHashesAlways and mystat is not None and \
len(distfilehashes[f]) == len(self.hashes) and \
distfilehashes[f]["size"] == mystat.st_size)) and \
- portage.const.MANIFEST2_REQUIRED_HASH in distfilehashes[f].keys():
+ not required_hash_types.difference(distfilehashes[f]):
self.fhashdict["DIST"][f] = distfilehashes[f]
else:
try: