From: Thierry Parmentelat Date: Tue, 15 May 2012 10:20:34 +0000 (+0200) Subject: whoops X-Git-Tag: bootmanager-5.0-22~1 X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=b202556d5c80ba00eb4caf7ea7cf110187c3cdf0 whoops --- diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index a69d61f..c157db4 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -122,14 +122,14 @@ def Run( vars, log ): source_hash_file= "/boot/%s.sha1sum" % (tarball) dest_hash_file= "%s/%s.sha1sum" % (SYSIMG_PATH, tarball) - time_beg=time.now() + time_beg=time.time() log.write( "downloading %s\n" % source_file ) # 30 is the connect timeout, 14400 is the max transfer time in # seconds (4 hours) result = bs_request.DownloadFile( source_file, None, None, 1, 1, dest_file, 30, 14400) - time_end=time.now() + time_end=time.time() duration=int(time_end-time_beg) log.write("Done downloading (%s seconds)\n"%duration) if result: @@ -144,10 +144,10 @@ def Run( vars, log ): raise BootManagerException, "FATAL: SHA1 checksum does not match between %s and %s" % (source_file, source_hash_file) - time_beg=time.now() + time_beg=time.time() log.write( "extracting %s in %s\n" % (dest_file,SYSIMG_PATH) ) result = utils.sysexec( "tar -C %s -xpf %s %s" % (SYSIMG_PATH,dest_file,uncompress_option), log ) - time_end=time.now() + time_end=time.time() duration=int(time_end-time_beg) log.write( "Done extracting (%s seconds)\n"%duration) utils.removefile( dest_file )