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

bfree.patch (text/plain), 855 bytes, created by Zac Medico on 2009-04-30 06:36:05 UTC

Index: pym/portage/__init__.py
===================================================================
--- pym/portage/__init__.py	(revision 13375)
+++ pym/portage/__init__.py	(revision 13419)
@@ -3944,8 +3979,17 @@
 					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 secpass < 2:
+						has_space = False
+					elif userfetch:
+						has_space = False
+					elif (size - mysize + vfs_stat.f_bsize) >= \
+						(vfs_stat.f_bsize * vfs_stat.f_bfree):
+						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: