From 430f4be07bfc1ef0660b079c6370ea8b993eaf6a Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Jun 2007 13:09:30 +0000
Subject: Revert r6967 since shutil.move() is broken internally.

svn path=/main/trunk/; revision=6970
---
 pym/emerge/__init__.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'pym/emerge/__init__.py')

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index ac74f12d2..17ff8d58d 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -3754,17 +3754,14 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 
 			icount=0
 			badcount=0
-			import shutil
 			for inforoot in regen_infodirs:
 				if inforoot=='':
 					continue
 				for filename in ("dir", "dir.gz", "dir.bz2"):
 					file_path = os.path.join(inforoot, filename)
-					if not os.path.exists(file_path):
-						continue
 					try:
-						shutil.move(file_path, file_path + ".old")
-					except EnvironmentError, e:
+						os.rename(file_path, file_path + ".old")
+					except OSError, e:
 						if e.errno != errno.ENOENT:
 							raise
 						del e
-- 
cgit v1.2.3-1-g7c22