Further development in bundle_volume

[snf-image-creator] / image_creator / util.py

diff --git a/image_creator/util.py b/image_creator/util.py
index 184dada..61cc2a6 100644 (file)
--- 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)
 
 
@@ -64,7 +64,7 @@ class MD5:
         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