Merge branch 'master' into download_using_requests

Author: Yaniv Kaul

lago/brctl.py

@@ -56,5 +56,14 @@ def destroy(name):
 
 
 def exists(name):
-    ret, out, err = _brctl('show', name)
-    return err == ''
+    ret, out, _ = utils.run_command(
+        ['ip', '-o', 'link', 'show', 'type', 'bridge']
+    )
+    if ret:
+        raise RuntimeError('Failed to check if bridge {} exists'.format(name))
+
+    for entry in out.splitlines():
+        if name == entry.split(':')[1].strip():
+            return True
+
+    return False

lago/cmd.py

@@ -148,7 +148,10 @@ def do_init(
     with log_utils.LogTask('Initialize and populate prefix', LOGGER):
         LOGGER.debug('Using workdir %s', workdir)
         workdir = lago_workdir.Workdir(workdir)
-        if not os.path.exists(workdir.path):
+        if not (
+            os.path.exists(workdir.path)
+            and lago.workdir.Workdir.is_workdir(workdir.path)
+        ):
             LOGGER.debug(
                 'Initializing workdir %s with prefix %s',
                 workdir.path,

lago/paths.py

@@ -34,6 +34,8 @@ def __init__(self, prefix_path):
         Args:
             prefix_path (str): Path to the directory of the prefix
         """
+        # self._prefix should be dropped in lago ver 0.44
+        self.prefix = prefix_path
         self._prefix_path = prefix_path
 
     def prefixed(self, *args):

lago/prefix.py

@@ -106,6 +106,8 @@ def __init__(self, prefix):
         Args:
             prefix (str): Path of the prefix
         """
+        # self._prefix should be dropped in lago ver 0.44
+        self._prefix = prefix
         self._paths = paths.Paths(prefix)
         self._virt_env = None
         self._metadata = None
@@ -1403,6 +1405,10 @@ def virt_env(self):
     def paths(self):
         return self._paths
 
+    @paths.setter
+    def paths(self, val):
+        self._paths = val
+
     def destroy(self):
         """
         Destroy this prefix, running any cleanups and removing any files