Merge pull request bit-team#959 from belsander/master

CLI fixes for docker

Author: Germar

common/cli.py

@@ -194,9 +194,9 @@ def terminalSize():
     return [24, 80]
 
 def frame(msg, size = 32):
-    ret  = ' ┌' + '─' * size +       '┐\n'
-    ret += ' │' + msg.center(size) + '│\n'
-    ret += ' └' + '─' * size +       '┘'
+    ret  = ' +' + '-' * size +       '+\n'
+    ret += ' |' + msg.center(size) + '|\n'
+    ret += ' +' + '-' * size +       '+'
     return ret
 
 class RestoreDialog(object):

common/test/test_backintime.py

@@ -77,14 +77,14 @@ def test_local_snapshot_is_successful(self):
 
 (INFO: Update to config version \d+
 )?
- ┌────────────────────────────────┐
- │  Check/prepair snapshot path   │
- └────────────────────────────────┘
+ \+--------------------------------\+
+ |  Check/prepair snapshot path   |
+ \+--------------------------------\+
 Check/prepair snapshot path: done
 
- ┌────────────────────────────────┐
- │          Check config          │
- └────────────────────────────────┘
+ \+--------------------------------\+
+ |          Check config          |
+ \+--------------------------------\+
 Check config: done
 
 Config .*test/config profile 'Main profile' is fine.''', re.MULTILINE))

common/tools.py

@@ -449,11 +449,14 @@ def checkXServer():
     Returns:
         bool:   ``True`` if X11 server is running
     """
-    proc = subprocess.Popen(['xdpyinfo'],
-                            stdout = subprocess.DEVNULL,
-                            stderr = subprocess.DEVNULL)
-    proc.communicate()
-    return proc.returncode == 0
+    if which('xdpyinfo') is not None:
+        proc = subprocess.Popen(['xdpyinfo'],
+                                stdout = subprocess.DEVNULL,
+                                stderr = subprocess.DEVNULL)
+        proc.communicate()
+        return proc.returncode == 0
+    else:
+        return False
 
 def preparePath(path):
     """
@@ -934,9 +937,22 @@ def uuidFromDev(dev):
     """
     if dev and os.path.exists(dev):
         dev = os.path.realpath(dev)
-        for uuid in os.listdir(DISK_BY_UUID):
-            if dev == os.path.realpath(os.path.join(DISK_BY_UUID, uuid)):
-                return uuid
+        if os.path.exists(DISK_BY_UUID):
+            for uuid in os.listdir(DISK_BY_UUID):
+                if dev == os.path.realpath(os.path.join(DISK_BY_UUID, uuid)):
+                    return uuid
+        else:
+            c = re.compile(b'.*\sUUID="([^"]*)".*')
+            try:
+                # If device does not exist, blkid will exit with a non-zero code
+                blkid = subprocess.check_output(['blkid', dev],
+                                                stderr = subprocess.DEVNULL)
+                uuid = c.findall(blkid)
+                if uuid:
+                    return uuid[0].decode('UTF-8')
+            except:
+                pass
+
     c = re.compile(b'.*?ID_FS_UUID=(\S+)')
     try:
         udevadm = subprocess.check_output(['udevadm', 'info', '--name=%s' % dev],