fixed errors in builder_image

pym/calculate/lib/utils/files.py

@@ -489,12 +489,10 @@ class typeFile():
 
     def getMTypeBuf_(self, buf):
         try:
-            ret = self.magicObject.buffer(buf)
+            ret = self.magicObject.buffer(buf).decode('utf-8')
         except UnicodeDecodeError:
-            try:
-                ret = self.magicObject.buffer(buf.decode('utf-8'))
-            except UnicodeDecodeError:
-                return None
+            ret = self.magicObject.buffer(buf)
+            return None
         return ret
 
     def getMTypeBuf(self, buf):

pym/calculate/lib/utils/kernel.py

@@ -92,7 +92,7 @@ class InitrdFile():
                      stderr=PIPE, close_fds=True)
         try:
             for fn in cpio.stdout:
-                yield fn.rstrip()
+                yield fn.rstrip().decode("UTF-8")
         finally:
             cpio.terminate()
             gz.terminate()