diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-23 13:11:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-23 13:11:08 +0000 |
| commit | d991c870472a1de90ee56aa0b31cc5d2d390e562 (patch) | |
| tree | 485324cdfc824b9ab7eb7044229a7913f1ca3a46 /bin/emerge | |
| parent | 7cd90408efd0ccf9727037233dfa1266f57d48d2 (diff) | |
| download | portage-d991c870472a1de90ee56aa0b31cc5d2d390e562.tar.gz portage-d991c870472a1de90ee56aa0b31cc5d2d390e562.tar.bz2 portage-d991c870472a1de90ee56aa0b31cc5d2d390e562.zip | |
Revert r6968 since shutil.move() is broken internally.
svn path=/main/branches/2.1.2/; revision=6971
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index 914f8d69c..3d6e9e245 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3696,17 +3696,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 |