[patch] use the f_bfree field when necessary but only if userfetch is not enabled

bfree.patch (text/plain), 848 bytes, created by Zac Medico on 2009-04-29 00:20:39 UTC

Index: pym/portage/__init__.py
===================================================================
--- pym/portage/__init__.py	(revision 13405)
+++ pym/portage/__init__.py	(revision 13406)
@@ -3947,9 +3947,16 @@
 					mysize = 0
 				if (size - mysize + vfs_stat.f_bsize) >= \
 					(vfs_stat.f_bsize * vfs_stat.f_bavail):
-					writemsg("!!! Insufficient space to store %s in %s\n" % (myfile, mysettings["DISTDIR"]), noiselevel=-1)
-					has_space = False
+					if 'userfetch' in features:
+						has_space = False
+					elif (size - mysize + vfs_stat.f_bfree) >= \
+						(vfs_stat.f_bfree * vfs_stat.f_bavail):
+						has_space = False
 
+			if not has_space:
+				writemsg("!!! Insufficient space to store %s in %s\n" % \
+					(myfile, mysettings["DISTDIR"]), noiselevel=-1)
+
 			if distdir_writable and use_locks:
 
 				if locks_in_subdir: