From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:29:53 +0000 (-0000)
Subject: Fix the code from bug #267104 to account non-root users. (trunk r13408)
X-Git-Tag: v2.1.6.12~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3172db4567695fdbf3f4a3dd4736b5c1329008f6;p=portage.git

Fix the code from bug #267104 to account non-root users. (trunk r13408)

svn path=/main/branches/2.1.6/; revision=13548
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 632ed71cb..5d049990b 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3937,7 +3937,9 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 					mysize = 0
 				if (size - mysize + vfs_stat.f_bsize) >= \
 					(vfs_stat.f_bsize * vfs_stat.f_bavail):
-					if 'userfetch' in features:
+					if secpass < 2:
+						has_space = False
+					elif userfetch:
 						has_space = False
 					elif (size - mysize + vfs_stat.f_bfree) >= \
 						(vfs_stat.f_bfree * vfs_stat.f_bavail):