Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13408 - main/trunk/pym/portage
Date: Wed, 29 Apr 2009 05:03:48
Message-Id: E1Lz1xS-0001R8-9l@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-29 05:03:45 +0000 (Wed, 29 Apr 2009)
3 New Revision: 13408
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 Fix the code from bug #267104 to account non-root users.
9
10
11 Modified: main/trunk/pym/portage/__init__.py
12 ===================================================================
13 --- main/trunk/pym/portage/__init__.py 2009-04-29 00:35:52 UTC (rev 13407)
14 +++ main/trunk/pym/portage/__init__.py 2009-04-29 05:03:45 UTC (rev 13408)
15 @@ -3947,8 +3947,10 @@
16 mysize = 0
17 if (size - mysize + vfs_stat.f_bsize) >= \
18 (vfs_stat.f_bsize * vfs_stat.f_bavail):
19 - if 'userfetch' in features:
20 + if secpass < 2:
21 has_space = False
22 + elif userfetch:
23 + has_space = False
24 elif (size - mysize + vfs_stat.f_bfree) >= \
25 (vfs_stat.f_bfree * vfs_stat.f_bavail):
26 has_space = False