From bc52b031b8e1396ecfb017db3c87f540026e3135 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 29 Sep 2010 18:48:01 +0000 Subject: [PATCH] Fix getting free space for samba and none devices --- pym/cl_builder.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pym/cl_builder.py b/pym/cl_builder.py index afd048b..138f813 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -176,9 +176,9 @@ class cl_builder(color_print): def getFreeFor(self,pathname): """Get free for pathname""" dfProcess = process("/bin/df","-h",pathname) - data = filter(lambda x:x.startswith('/dev'),dfProcess) - if data: - data = filter(lambda x:x,data[0].split()) + data = dfProcess.readlines() + if len(data)>1: + data = filter(lambda x:x,"\t".join(data[1:]).split()) if len(data)>3: return data[3] return "Unknown" @@ -198,7 +198,8 @@ class cl_builder(color_print): self.getFreeFor(path.dirname(path.normpath( self.clVars.Get('cl_builder_iso_path'))))) self.printSUCCESS(_("Free disk space for iso image: %s")% - self.getFreeFor(self.clVars.Get('cl_builder_image'))) + self.getFreeFor(path.dirname(path.normpath( + self.clVars.Get('cl_builder_image'))))) self.defaultPrint("%s\n"%_("Perform pre-install checkups")) if self.clVars.Get('cl_builder_image'):