X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/e77e66a923367afd618cb5d7b977095cac119b75..6523456eff0071b3e87af2b7ee7465ebf49d527b:/image_creator/util.py

diff --git a/image_creator/util.py b/image_creator/util.py
index 161b73d..61cc2a6 100644
--- a/image_creator/util.py
+++ b/image_creator/util.py
@@ -32,7 +32,7 @@
 # or implied, of GRNET S.A.
 
 import sys
-import pbs
+import sh
 import hashlib
 
 
@@ -45,12 +45,12 @@ 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)
 
 
@@ -60,10 +60,11 @@ class MD5:
 
     def compute(self, filename, size):
 
-        BLOCKSIZE = 2 ** 22  # 4MB
+        MB = 2 ** 20
+        BLOCKSIZE = 4 * MB  # 4MB
 
-        progressbar = self.out.Progress("Calculating md5sum:", 'mb')
-        progressbar.max = ((size + 2 ** 20 - 1) // (2 ** 20))
+        prog_size = ((size + MB - 1) // MB)  # in MB
+        progressbar = self.out.Progress(prog_size, "Calculating md5sum", 'mb')
         md5 = hashlib.md5()
         with open(filename, "r") as src:
             left = size
@@ -72,7 +73,7 @@ class MD5:
                 data = src.read(length)
                 md5.update(data)
                 left -= length
-                progressbar.goto((size - left) // (2 ** 20))
+                progressbar.goto((size - left) // MB)
 
         checksum = md5.hexdigest()
         progressbar.success(checksum)