summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-29 05:03:45 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-29 05:03:45 +0000
commit59dbbe2cf281736caa5ec3db3c47b30b5afd9d70 (patch)
treef51e947ea2fab093812f60f512f54c48f67954b8
parenteada90aaa2f14444cdb2df40556da0d34ebce7f4 (diff)
downloadportage-59dbbe2cf281736caa5ec3db3c47b30b5afd9d70.tar.gz
portage-59dbbe2cf281736caa5ec3db3c47b30b5afd9d70.tar.bz2
portage-59dbbe2cf281736caa5ec3db3c47b30b5afd9d70.zip
Fix the code from bug #267104 to account non-root users.
svn path=/main/trunk/; revision=13408
-rw-r--r--pym/portage/__init__.py4
1 files changed, 3 insertions, 1 deletions
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):