In movefile(), skip os.utime() when os.rename() succeeds, in order to

completely preserve mtime resolution. (trunk r14897)

svn path=/main/branches/2.1.7/; revision=14902

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 25ef6fb3f890a503dc8b02025452b889d1007a4d..e2285499697ba9232f384376a058308dd85fc726 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7565,6 +7565,8 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
        try:
                if hardlinked:
                        newmtime = long(os.stat(dest).st_mtime)
+               elif not renamefailed:
+                       newmtime = long(sstat.st_mtime)
                else:
                        if newmtime is not None:
                                os.utime(dest, (newmtime, newmtime))