aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-07-04 17:20:27 -0700
committerZac Medico <zmedico@gentoo.org>2012-07-04 17:20:27 -0700
commitf9d725d5f5f71e77803c44cc0701c846ae44b2aa (patch)
treeb0fe5b4ed45da2ccfd302f94a7066853925b4007
parentemerge: more helpful "non-existent set" message (diff)
downloadportage-f9d725d5f5f71e77803c44cc0701c846ae44b2aa.tar.gz
portage-f9d725d5f5f71e77803c44cc0701c846ae44b2aa.tar.bz2
portage-f9d725d5f5f71e77803c44cc0701c846ae44b2aa.zip
const: Adjust MANIFEST2_* for new defaults
-rw-r--r--pym/portage/const.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py
index 51dcfb0bd..ceef5c56b 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -114,13 +114,15 @@ HASHING_BLOCKSIZE = 32768
MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160")
MANIFEST1_REQUIRED_HASH = "MD5"
-# Future events:
+# Past events:
#
-# After WHIRLPOOL is supported in stable portage:
-# - Add SHA256 and WHIRLPOOL to MANIFEST2_HASH_DEFAULTS.
-# - Remove SHA1 and RMD160 from MANIFEST2_HASH_*.
+# 20120704 - After WHIRLPOOL is supported in stable portage:
# - Set manifest-hashes in gentoo-x86/metadata/layout.conf as follows:
# manifest-hashes = SHA256 SHA512 WHIRLPOOL
+# - Add SHA512 and WHIRLPOOL to MANIFEST2_HASH_DEFAULTS.
+# - Remove SHA1 and RMD160 from MANIFEST2_HASH_*.
+#
+# Future events:
#
# After WHIRLPOOL is supported in stable portage for at least 1 year:
# - Change MANIFEST2_REQUIRED_HASH to WHIRLPOOL.
@@ -138,8 +140,8 @@ MANIFEST1_REQUIRED_HASH = "MD5"
# After layout.conf settings correspond to defaults in stable portage:
# - Remove redundant settings from gentoo-x86/metadata/layout.conf.
-MANIFEST2_HASH_FUNCTIONS = ("RMD160", "SHA1", "SHA256", "SHA512", "WHIRLPOOL")
-MANIFEST2_HASH_DEFAULTS = frozenset(["SHA1", "SHA256", "RMD160"])
+MANIFEST2_HASH_FUNCTIONS = ("SHA256", "SHA512", "WHIRLPOOL")
+MANIFEST2_HASH_DEFAULTS = frozenset(["SHA256", "SHA512", "WHIRLPOOL"])
MANIFEST2_REQUIRED_HASH = "SHA256"
MANIFEST2_IDENTIFIERS = ("AUX", "MISC", "DIST", "EBUILD")