Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12112 - main/branches/2.1.6/pym/portage
Date: Wed, 26 Nov 2008 23:07:51
Message-Id: E1L5TU1-0002Kl-7w@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-11-26 23:07:44 +0000 (Wed, 26 Nov 2008)
3 New Revision: 12112
4
5 Modified:
6 main/branches/2.1.6/pym/portage/__init__.py
7 Log:
8 In movefile(), ignore the hardlink_candidates parameter when it's an empty list.
9 (trunk r12111)
10
11
12 Modified: main/branches/2.1.6/pym/portage/__init__.py
13 ===================================================================
14 --- main/branches/2.1.6/pym/portage/__init__.py 2008-11-26 23:06:41 UTC (rev 12111)
15 +++ main/branches/2.1.6/pym/portage/__init__.py 2008-11-26 23:07:44 UTC (rev 12112)
16 @@ -6036,7 +6036,7 @@
17 # so os.link() calls might fail for some paths, so try them all.
18 # For atomic replacement, first create the link as a temp file
19 # and them use os.rename() to replace the destination.
20 - if hardlink_candidates is not None:
21 + if hardlink_candidates:
22 head, tail = os.path.split(dest)
23 hardlink_tmp = os.path.join(head, ".%s._portage_merge_.%s" % \
24 (tail, os.getpid()))