From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 29 Apr 2009 05:03:45 +0000 (-0000)
Subject: Fix the code from bug #267104 to account non-root users.
X-Git-Tag: v2.2_rc32~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59dbbe2cf281736caa5ec3db3c47b30b5afd9d70;p=portage.git

Fix the code from bug #267104 to account non-root users.

svn path=/main/trunk/; revision=13408
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 5a0f86da2..d852efe78 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3947,7 +3947,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):