modified: singularity/analysis/reproduce/hash.py

	modified:   singularity/cli/__init__.py

Author: vsoch

singularity/analysis/reproduce/hash.py

@@ -32,6 +32,7 @@
 from singularity.analysis.reproduce.levels import *
 from singularity.analysis.reproduce.utils import (
     get_image_tar,
+    extract_content,
     delete_image_tar,
     extract_guts
 )

singularity/cli/__init__.py

@@ -58,7 +58,10 @@ def run_command(self, cmd, sudo=False, quiet=False):
 
         if result['return_code'] == 0:
             if isinstance(message,bytes):
-                message=message.decode('utf-8')
+                try:
+                    message=message.decode('utf-8')
+                except UnicodeDecodeError:
+                    message = unicode(message, errors='replace')
             return message
         if quiet is False:
             bot.error("Return Code %s: %s" %(return_code,