summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 07:29:53 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 07:29:53 +0000
commit3172db4567695fdbf3f4a3dd4736b5c1329008f6 (patch)
tree582ce97fcce7250fea8a22f541e19c977dbf5ed0
parentBug #267810 - Don't sort C/CXX/LDFLAGS in emerge --info output since these (diff)
downloadportage-multirepo-3172db4567695fdbf3f4a3dd4736b5c1329008f6.tar.gz
portage-multirepo-3172db4567695fdbf3f4a3dd4736b5c1329008f6.tar.bz2
portage-multirepo-3172db4567695fdbf3f4a3dd4736b5c1329008f6.zip
Fix the code from bug #267104 to account non-root users. (trunk r13408)
svn path=/main/branches/2.1.6/; revision=13548
-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 632ed71c..5d049990 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):