From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B9C0139696 for ; Tue, 28 Feb 2017 22:07:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7970E0C87; Tue, 28 Feb 2017 22:07:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95C04E0C87 for ; Tue, 28 Feb 2017 22:07:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8115D34169F for ; Tue, 28 Feb 2017 22:07:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC31057F5 for ; Tue, 28 Feb 2017 22:07:15 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1488319629.0dc2b065e16f1bec22b1730c2b2faf06e01d10af.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0dc2b065e16f1bec22b1730c2b2faf06e01d10af X-VCS-Branch: master Date: Tue, 28 Feb 2017 22:07:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f76482ea-218f-4223-924c-d7c96f85c22f X-Archives-Hash: ac3423e5ebe104a1b90f793ef5e8e2e3 commit: 0dc2b065e16f1bec22b1730c2b2faf06e01d10af Author: Michał Górny gentoo org> AuthorDate: Tue Feb 28 09:36:55 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Feb 28 22:07:09 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0dc2b065 vartree: Replace uses of internal portage.checksum._new_md5 var Use the public hashlib.md5 method that is required for other code in the module already. pym/portage/dbapi/vartree.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 2a612d162..c421dc50b 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4690,8 +4690,7 @@ class dblink(object): os.unlink(mysrc) os.symlink(myto, mysrc) - mymd5 = portage.checksum._new_md5( - _unicode_encode(myto)).hexdigest() + mymd5 = md5(_unicode_encode(myto)).hexdigest() protected = False if stat.S_ISLNK(mymode) or stat.S_ISREG(mymode): @@ -4725,8 +4724,7 @@ class dblink(object): # of the link target path string is used # for cfgfiledict (symlinks are # protected since bug #485598). - destmd5 = portage.checksum._new_md5( - _unicode_encode(mydest_link)).hexdigest() + destmd5 = md5(_unicode_encode(mydest_link)).hexdigest() elif stat.S_ISREG(mydmode): destmd5 = perform_md5(mydest,