From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 21 Jul 2006 07:09:28 +0000 (-0000)
Subject: Do the portage_checksum import in local scope because of circular dependency.
X-Git-Tag: v2.1.1~162
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8802b0678bdfdea528c4a2f13f7b38a68b10ca8b;p=portage.git

Do the portage_checksum import in local scope because of circular dependency.

svn path=/main/trunk/; revision=3979
---

diff --git a/pym/portage_util.py b/pym/portage_util.py
index cf115d1e9..b1974b543 100644
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -6,7 +6,6 @@ from portage_exception import PortageException, FileNotFound, \
        OperationNotPermitted, PermissionDenied, ReadOnlyFileSystem
 import portage_exception
 from portage_dep import isvalidatom
-import portage_checksum
 
 import sys,string,shlex,os,errno
 try:
@@ -895,6 +894,7 @@ def new_protect_filename(mydest, newmd5=None):
 		"._cfg" + str(prot_num).zfill(4) + "_" + real_filename))
 	old_pfile = normalize_path(os.path.join(real_dirname, last_pfile))
 	if last_pfile and newmd5:
+		import portage_checksum
 		if portage_checksum.perform_md5(
 			os.path.join(real_dirname, last_pfile)) == newmd5:
 			return old_pfile