X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/96171db1ec35f7e5f600563a55e1c36d58edcdf8..f3845095c7f8802c4dd40d7679e14831d7f70b59:/image_creator/util.py

diff --git a/image_creator/util.py b/image_creator/util.py
index 184dada..1cd97ff 100644
--- a/image_creator/util.py
+++ b/image_creator/util.py
@@ -32,8 +32,9 @@
 # or implied, of GRNET S.A.
 
 import sys
-import pbs
+import sh
 import hashlib
+import time
 
 
 class FatalError(Exception):
@@ -45,26 +46,43 @@ def get_command(command):
         search_paths = ['/usr/local/sbin', '/usr/sbin', '/sbin']
         for fullpath in map(lambda x: "%s/%s" % (x, command), search_paths):
             if os.path.exists(fullpath) and os.access(fullpath, os.X_OK):
-                return pbs.Command(fullpath)
+                return sh.Command(fullpath)
         raise exception
 
     try:
-        return pbs.__getattr__(command)
-    except pbs.CommadNotFount as e:
+        return sh.__getattr__(command)
+    except sh.CommadNotFount as e:
         return find_sbin_command(command, e)
 
 
+def try_fail_repeat(command, *args):
+
+    times = (0.1, 0.5, 1, 2)
+    i = iter(times)
+    while True:
+        try:
+            command(*args)
+            return
+        except sh.ErrorReturnCode:
+            try:
+                wait = i.next()
+            except StopIteration:
+                break
+            time.sleep(wait)
+
+    raise FatalError("Command: `%s %s' failed" % (command, " ".join(args)))
+
+
 class MD5:
     def __init__(self, output):
         self.out = output
 
     def compute(self, filename, size):
-
         MB = 2 ** 20
         BLOCKSIZE = 4 * MB  # 4MB
 
         prog_size = ((size + MB - 1) // MB)  # in MB
-        progressbar = self.out.Progress(prog_size, "Calculating md5sum:", 'mb')
+        progressbar = self.out.Progress(prog_size, "Calculating md5sum", 'mb')
         md5 = hashlib.md5()
         with open(filename, "r") as src:
             left = size