Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/
Date: Tue, 28 Feb 2017 22:07:20
Message-Id: 1488319629.0dc2b065e16f1bec22b1730c2b2faf06e01d10af.mgorny@gentoo
1 commit: 0dc2b065e16f1bec22b1730c2b2faf06e01d10af
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 09:36:55 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 22:07:09 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0dc2b065
7
8 vartree: Replace uses of internal portage.checksum._new_md5 var
9
10 Use the public hashlib.md5 method that is required for other code in
11 the module already.
12
13 pym/portage/dbapi/vartree.py | 6 ++----
14 1 file changed, 2 insertions(+), 4 deletions(-)
15
16 diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
17 index 2a612d162..c421dc50b 100644
18 --- a/pym/portage/dbapi/vartree.py
19 +++ b/pym/portage/dbapi/vartree.py
20 @@ -4690,8 +4690,7 @@ class dblink(object):
21 os.unlink(mysrc)
22 os.symlink(myto, mysrc)
23
24 - mymd5 = portage.checksum._new_md5(
25 - _unicode_encode(myto)).hexdigest()
26 + mymd5 = md5(_unicode_encode(myto)).hexdigest()
27
28 protected = False
29 if stat.S_ISLNK(mymode) or stat.S_ISREG(mymode):
30 @@ -4725,8 +4724,7 @@ class dblink(object):
31 # of the link target path string is used
32 # for cfgfiledict (symlinks are
33 # protected since bug #485598).
34 - destmd5 = portage.checksum._new_md5(
35 - _unicode_encode(mydest_link)).hexdigest()
36 + destmd5 = md5(_unicode_encode(mydest_link)).hexdigest()
37
38 elif stat.S_ISREG(mydmode):
39 destmd5 = perform_md5(mydest,