diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-23 13:09:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-23 13:09:30 +0000 |
| commit | 430f4be07bfc1ef0660b079c6370ea8b993eaf6a (patch) | |
| tree | bc2792002c962fe78a0abc45215735592193a138 /pym/emerge/__init__.py | |
| parent | d5614c77c8dd2be6e1f9eadf17ccab3db8bdb12b (diff) | |
| download | portage-430f4be07bfc1ef0660b079c6370ea8b993eaf6a.tar.gz portage-430f4be07bfc1ef0660b079c6370ea8b993eaf6a.tar.bz2 portage-430f4be07bfc1ef0660b079c6370ea8b993eaf6a.zip | |
Revert r6967 since shutil.move() is broken internally.
svn path=/main/trunk/; revision=6970
Diffstat (limited to 'pym/emerge/__init__.py')
| -rw-r--r-- | pym/emerge/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
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 |