From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-620130-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DBD0A1381F3 for <garchives@archives.gentoo.org>; Sun, 18 Aug 2013 06:52:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6D36E0BAC; Sun, 18 Aug 2013 06:52:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DE41E0BAC for <gentoo-commits@lists.gentoo.org>; Sun, 18 Aug 2013 06:52:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 902DF33EA5A for <gentoo-commits@lists.gentoo.org>; Sun, 18 Aug 2013 06:52:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 13744E468F for <gentoo-commits@lists.gentoo.org>; Sun, 18 Aug 2013 06:52:02 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <1376808705.ddd1bc384629571d52d5c5f59a5446debaeae01a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/archive-conf X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ddd1bc384629571d52d5c5f59a5446debaeae01a X-VCS-Branch: master Date: Sun, 18 Aug 2013 06:52:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d25658dc-9cef-4af3-8a35-b989dcf0d8ff X-Archives-Hash: d83ab8ef2571393b8e5b5412617afe30 commit: ddd1bc384629571d52d5c5f59a5446debaeae01a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Aug 18 06:51:45 2013 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Aug 18 06:51:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ddd1bc38 archive-conf: fix for python3, bug #481518 --- bin/archive-conf | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/bin/archive-conf b/bin/archive-conf index f8efcb9..2c34588 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -21,34 +21,12 @@ portage._internal_caller = True import portage.dispatch_conf from portage import os +from portage.checksum import perform_md5 FIND_EXTANT_CONTENTS = "find %s -name CONTENTS" MANDATORY_OPTS = [ 'archive-dir' ] -try: - import fchksum - def perform_checksum(filename): return fchksum.fmd5t(filename) -except ImportError: - import md5 - def md5_to_hex(md5sum): - hexform = "" - for ix in range(len(md5sum)): - hexform = hexform + "%02x" % ord(md5sum[ix]) - return hexform.lower() - - def perform_checksum(filename): - f = open(filename, 'rb') - blocksize=32768 - data = f.read(blocksize) - size = 0 - checksum = md5.new() - while data: - checksum.update(data) - size = size + len(data) - data = f.read(blocksize) - return (md5_to_hex(checksum.digest()), size) - def archive_conf(): args = [] content_files = [] @@ -84,7 +62,7 @@ def archive_conf(): for conf in args: if items[1] == conf: stored = items[2].lower() - real = perform_checksum(conf)[0].lower() + real = perform_md5(conf).lower() if stored == real: md5_match_hash[conf] = conf todo_cnt -= 1