Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 2/2] vartree: Replace uses of internal portage.checksum._new_md5 var
Date: Tue, 28 Feb 2017 10:12:48
Message-Id: 20170228101204.31808-3-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCHES] Fix md5 refs in vartree by "Michał Górny"
1 Use the public hashlib.md5 method that is required for other code in
2 the module already.
3 ---
4 pym/portage/dbapi/vartree.py | 6 ++----
5 1 file changed, 2 insertions(+), 4 deletions(-)
6
7 diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
8 index 2a612d162..c421dc50b 100644
9 --- a/pym/portage/dbapi/vartree.py
10 +++ b/pym/portage/dbapi/vartree.py
11 @@ -4690,8 +4690,7 @@ class dblink(object):
12 os.unlink(mysrc)
13 os.symlink(myto, mysrc)
14
15 - mymd5 = portage.checksum._new_md5(
16 - _unicode_encode(myto)).hexdigest()
17 + mymd5 = md5(_unicode_encode(myto)).hexdigest()
18
19 protected = False
20 if stat.S_ISLNK(mymode) or stat.S_ISREG(mymode):
21 @@ -4725,8 +4724,7 @@ class dblink(object):
22 # of the link target path string is used
23 # for cfgfiledict (symlinks are
24 # protected since bug #485598).
25 - destmd5 = portage.checksum._new_md5(
26 - _unicode_encode(mydest_link)).hexdigest()
27 + destmd5 = md5(_unicode_encode(mydest_link)).hexdigest()
28
29 elif stat.S_ISREG(mydmode):
30 destmd5 = perform_md5(mydest,
31 --
32 2.12.0