1 |
--- |
2 |
pym/portage/const.py | 1 - |
3 |
pym/portage/manifest.py | 7 ++----- |
4 |
2 files changed, 2 insertions(+), 6 deletions(-) |
5 |
|
6 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
7 |
index 98b7c88c9..0af57d0e2 100644 |
8 |
--- a/pym/portage/const.py |
9 |
+++ b/pym/portage/const.py |
10 |
@@ -205,7 +205,6 @@ SUPPORTED_FEATURES = frozenset([ |
11 |
EAPI = 6 |
12 |
|
13 |
HASHING_BLOCKSIZE = 32768 |
14 |
-MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160") |
15 |
|
16 |
MANIFEST2_HASH_DEFAULTS = frozenset(["SHA256", "SHA512", "WHIRLPOOL"]) |
17 |
MANIFEST2_REQUIRED_HASH = "SHA512" |
18 |
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py |
19 |
index 0a68aa653..36c82690c 100644 |
20 |
--- a/pym/portage/manifest.py |
21 |
+++ b/pym/portage/manifest.py |
22 |
@@ -26,7 +26,7 @@ from portage import _unicode_encode |
23 |
from portage.exception import DigestException, FileNotFound, \ |
24 |
InvalidDataType, MissingParameter, PermissionDenied, \ |
25 |
PortageException, PortagePackageException |
26 |
-from portage.const import (MANIFEST1_HASH_FUNCTIONS, MANIFEST2_HASH_DEFAULTS, |
27 |
+from portage.const import (MANIFEST2_HASH_DEFAULTS, |
28 |
MANIFEST2_IDENTIFIERS, MANIFEST2_REQUIRED_HASH) |
29 |
from portage.localization import _ |
30 |
|
31 |
@@ -710,10 +710,7 @@ class Manifest(object): |
32 |
myfile.close() |
33 |
for l in lines: |
34 |
mysplit = l.split() |
35 |
- if len(mysplit) == 4 and mysplit[0] in MANIFEST1_HASH_FUNCTIONS \ |
36 |
- and 1 not in rVal: |
37 |
- rVal.append(1) |
38 |
- elif len(mysplit) > 4 and mysplit[0] in MANIFEST2_IDENTIFIERS \ |
39 |
+ if len(mysplit) > 4 and mysplit[0] in MANIFEST2_IDENTIFIERS \ |
40 |
and ((len(mysplit) - 3) % 2) == 0 and not 2 in rVal: |
41 |
rVal.append(2) |
42 |
return rVal |
43 |
-- |
44 |
2.15.0 |