Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12118 - main/branches/2.1.6/pym/portage
Date: Thu, 27 Nov 2008 02:36:59
Message-Id: E1L5WkQ-0007m0-Fv@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-11-27 02:36:41 +0000 (Thu, 27 Nov 2008)
3 New Revision: 12118
4
5 Modified:
6 main/branches/2.1.6/pym/portage/__init__.py
7 Log:
8 Use stat st_dev attributes instead of the older approach. (trunk r12117)
9
10
11 Modified: main/branches/2.1.6/pym/portage/__init__.py
12 ===================================================================
13 --- main/branches/2.1.6/pym/portage/__init__.py 2008-11-27 02:34:52 UTC (rev 12117)
14 +++ main/branches/2.1.6/pym/portage/__init__.py 2008-11-27 02:36:41 UTC (rev 12118)
15 @@ -6071,8 +6071,7 @@
16 renamefailed=1
17 if hardlinked:
18 renamefailed = False
19 - if not hardlinked and \
20 - (selinux_enabled or sstat[stat.ST_DEV] == dstat[stat.ST_DEV]):
21 + if not hardlinked and (selinux_enabled or sstat.st_dev == dstat.st_dev):
22 try:
23 if selinux_enabled:
24 ret=selinux.secure_rename(src,dest)