From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Nov 2008 02:36:41 +0000 (-0000)
Subject: Use stat st_dev attributes instead of the older approach. (trunk r12117)
X-Git-Tag: v2.1.6_rc2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=36b4850b70e8b57c2a1bb548daad0fab4ae4e995;p=portage.git

Use stat st_dev attributes instead of the older approach. (trunk r12117)

svn path=/main/branches/2.1.6/; revision=12118
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 862e50f18..9beb068c3 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6071,8 +6071,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 	renamefailed=1
 	if hardlinked:
 		renamefailed = False
-	if not hardlinked and \
-		(selinux_enabled or sstat[stat.ST_DEV] == dstat[stat.ST_DEV]):
+	if not hardlinked and (selinux_enabled or sstat.st_dev == dstat.st_dev):
 		try:
 			if selinux_enabled:
 				ret=selinux.secure_rename(src,dest)