Revert "replace deprecated popen2 with subprocess"

[bootmanager.git] / source / utils.py

diff --git a/source/utils.py b/source/utils.py
index 6cd286a..10607cc 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 *
 
@@ -121,7 +120,7 @@ def removedir( path ):
 
 
 
-def sysexec( cmd, log= None ):
+def sysexec( cmd, log= None, fsck = False ):
     """
     execute a system command, output the results to the logger
     if log <> None
@@ -132,7 +131,8 @@ def sysexec( cmd, log= None ):
     """
     if VERBOSE_MODE:
         print ("sysexec >>> %s" % cmd)
-    prog= popen2.Popen4( cmd, 0 )
+
+    prog = popen2.Popen4( cmd, 0 )
     if prog is None:
         raise BootManagerException, \
               "Unable to create instance of popen2.Popen4 " \
@@ -145,11 +145,24 @@ def sysexec( cmd, log= None ):
         except KeyboardInterrupt:
             raise BootManagerException, "Interrupted by user"
 
-    returncode= prog.wait()
-    if returncode != 0 and returncode != 256:
-        raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
-
-    prog= None
+    returncode = prog.wait()
+
+    if fsck:
+       # The exit code returned by fsck is the sum of the following conditions:
+       #      0    - No errors
+       #      1    - File system errors corrected
+       #      2    - System should be rebooted
+       #      4    - File system errors left uncorrected
+       #      8    - Operational error
+       #      16   - Usage or syntax error
+       #      32   - Fsck canceled by user request
+       #      128  - Shared library error
+       if returncode != 0 and returncode != 1:
+            raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
+    else:
+        if returncode != 0:
+            raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
+    prog = None
     return 1
 
 
@@ -255,7 +268,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