From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Nov 2008 02:34:52 +0000 (-0000)
Subject: Use stat st_dev attributes instead of the older approach.
X-Git-Tag: v2.2_rc17~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcfc91fc87a68c760d3df3e41b1056311c5b6d0e;p=portage.git

Use stat st_dev attributes instead of the older approach.

svn path=/main/trunk/; revision=12117
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d61803fe0..6ebfae4f1 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6081,8 +6081,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)