disable time/count based filesystems checks

[bootmanager.git] / source / utils.py

diff --git a/source/utils.py b/source/utils.py
index 6cd286a..429038d 100644 (file)
--- a/source/utils.py
+++ b/source/utils.py
@@ -16,7 +16,6 @@ import socket
 import fcntl
 import string
 import exceptions
-import hashlib
 
 from Exceptions import *
 
@@ -146,7 +145,20 @@ def sysexec( cmd, log= None ):
             raise BootManagerException, "Interrupted by user"
 
     returncode= prog.wait()
-    if returncode != 0 and returncode != 256:
+    # revert http://git.planet-lab.org/?p=bootmanager.git;a=commitdiff;h=cca3a2cd2096c0235dddb5982b1f05c8d4c7f916
+    # as 256 returned by Python
+    #
+    ## cat test.py 
+    #import popen2
+    #
+    #cmd = "false"
+    #prog = popen2.Popen4( cmd, 0 )
+    #returncode = prog.wait()
+    #print returncode
+    #
+    ## python test.py 
+    # 256
+    if returncode != 0:
         raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
 
     prog= None
@@ -255,7 +267,12 @@ def check_file_hash(filename, hash_filename):
 def sha1_file(filename):
     """Calculate sha1 hash of file."""
     try:
-        m = hashlib.sha1()
+        try:
+            import hashlib
+            m = hashlib.sha1()
+        except:
+            import sha
+            m=sha.new()
         f = file(filename, 'rb')
         while True:
             # 256 KB seems ideal for speed/memory tradeoff