[gentoo-commits] proj/portage:master commit in: pym/portage/util/

[Arfrever Frehtes Taifersar Arahesis]

commit:     a9645e8b16eb693ad160a0ec21797c31eb5b09a0
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Nov 30 02:09:00 2012 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Fri Nov 30 02:09:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a9645e8b

portage.util.movefile.movefile(): Try to preserve mtime of symlinks with Python >=3.3.

---
 pym/portage/util/movefile.py |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 98cf86a..57375f2 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -162,11 +162,17 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 					target != os.readlink(dest):
 					raise
 			lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
-			# utime() only works on the target of a symlink, so it's not
-			# possible to preserve mtime on symlinks.
 			if sys.hexversion >= 0x3030000:
-				return os.stat(dest, follow_symlinks=False).st_mtime_ns
+				try:
+					os.utime(dest, ns=(sstat.st_mtime_ns, sstat.st_mtime_ns), follow_symlinks=False)
+				except NotImplementedError:
+					# utimensat() and lutimes() missing in libc.
+					return os.stat(dest, follow_symlinks=False).st_mtime_ns
+				else:
+					return sstat.st_mtime_ns
 			else:
+				# utime() in Python <3.3 only works on the target of a symlink, so it's not
+				# possible to preserve mtime on symlinks.
 				return os.lstat(dest)[stat.ST_MTIME]
 		except SystemExit as e:
 			raise