Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13548 - main/branches/2.1.6/pym/portage
Date: Thu, 30 Apr 2009 07:29:56
Message-Id: E1LzQiQ-00026z-1d@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 07:29:53 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13548
4
5 Modified:
6 main/branches/2.1.6/pym/portage/__init__.py
7 Log:
8 Fix the code from bug #267104 to account non-root users. (trunk r13408)
9
10 Modified: main/branches/2.1.6/pym/portage/__init__.py
11 ===================================================================
12 --- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:29:39 UTC (rev 13547)
13 +++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:29:53 UTC (rev 13548)
14 @@ -3937,8 +3937,10 @@
15 mysize = 0
16 if (size - mysize + vfs_stat.f_bsize) >= \
17 (vfs_stat.f_bsize * vfs_stat.f_bavail):
18 - if 'userfetch' in features:
19 + if secpass < 2:
20 has_space = False
21 + elif userfetch:
22 + has_space = False
23 elif (size - mysize + vfs_stat.f_bfree) >= \
24 (vfs_stat.f_bfree * vfs_stat.f_bavail):
25 has_space = False