imount shell did not work properly for unknown fs types

ralphje · Sep 17, 2018 · 34e3fd4 · 34e3fd4
1 parent 7e9852f
commit 34e3fd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/imagemounter/cli/shell.py b/imagemounter/cli/shell.py
@@ -348,12 +348,12 @@ def _show_volume_system(volumes, level=0):
                 level += 1
                 for i, v in enumerate(volumes):
                     level_str = "  " * level + ("└ " if i == len(volumes) - 1 else "├ ")
-                    tp = v.volumes.vstype if v.fstype == 'volumesystem' else v.fstype if v.flag == 'alloc' else v.flag
+                    tp = v.volumes.vstype if v.fstype.type == 'volumesystem' else v.fstype if v.flag == 'alloc' else v.flag
 
                     print("{level_str}{index}  {type} {size:<10}  {description}".format(
                         level_str=level_str,
                         index=col("{:<5}".format(v.index), 'green' if v.is_mounted else None, attrs=['bold']),
-                        type=col("{:<10}".format(tp), attrs=['dark']),
+                        type=col("{:<10}".format(str(tp)), attrs=['dark']),
                         description=v.get_description(with_index=False, with_size=False)[:30],
                         size=v.get_formatted_size()
                     ))

diff --git a/imagemounter/filesystems.py b/imagemounter/filesystems.py
@@ -110,7 +110,7 @@ def __init__(self, fallback, *args, **kwargs):
         super(FallbackFileSystemType, self).__init__(*args, **kwargs)
 
     def __str__(self):
-        return "?" + self.type
+        return "?" + str(self.fallback)
 
 
 class UnknownFileSystemType(FileSystemType):