From ba3f1f86ae8f765aaf10b3e38040c808032e726b Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 24 Mar 2008 14:36:16 +0000 Subject: [PATCH] Before using statvfs, check it is actually available on the current host (OS). This commit is eligable for merging with the trunk svn path=/main/branches/prefix/; revision=9500 --- pym/portage/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1579b3d91..7c4ca5fb1 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3263,11 +3263,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", else: # check if there is enough space in DISTDIR to completely store myfile # overestimate the filesize so we aren't bitten by FS overhead - vfs_stat = os.statvfs(mysettings["DISTDIR"]) - if myfile in mydigests \ - and (mydigests[myfile]["size"] + 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 hasattr(os, "statvfs"): + vfs_stat = os.statvfs(mysettings["DISTDIR"]) + if myfile in mydigests \ + and (mydigests[myfile]["size"] + 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 use_locks and can_fetch: waiting_msg = None -- 2.26.2