| 1 |
commit: e5b963b794be20276786447bc4f2515e17e38086 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 2 23:43:27 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 2 23:43:27 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e5b963b7 |
| 7 |
|
| 8 |
Manifest.create(): tweak assume-digests code |
| 9 |
|
| 10 |
If we have a local file, before we assume that we don't need to compute |
| 11 |
any digests, make sure that the pre-computed digest types are exactly |
| 12 |
the same types that we desire. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/portage/manifest.py | 2 +- |
| 16 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py |
| 19 |
index 9db8acc..d09de26 100644 |
| 20 |
--- a/pym/portage/manifest.py |
| 21 |
+++ b/pym/portage/manifest.py |
| 22 |
@@ -387,7 +387,7 @@ class Manifest(object): |
| 23 |
((assumeDistHashesSometimes and mystat is None) or \ |
| 24 |
(assumeDistHashesAlways and mystat is None) or \ |
| 25 |
(assumeDistHashesAlways and mystat is not None and \ |
| 26 |
- len(distfilehashes[f]) == len(self.hashes) and \ |
| 27 |
+ set(distfilehashes[f]) == set(self.hashes) and \ |
| 28 |
distfilehashes[f]["size"] == mystat.st_size)): |
| 29 |
self.fhashdict["DIST"][f] = distfilehashes[f] |
| 30 |
else: |
Archives