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 632ed71cb04687e0403c3ad602d4254e07fa18ad..5d049990be8d003820734e1dea1175b88e6c22a6 100644 (file)
--- 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):