From dde8ed7ab6c3882d1e84f6ceb9da937aaca0fe08 Mon Sep 17 00:00:00 2001 From: Michael Bykovski Date: Tue, 27 Nov 2018 16:53:33 +0100 Subject: [PATCH] Changed path concatination to proper joins --- divio_cli/localdev/main.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/divio_cli/localdev/main.py b/divio_cli/localdev/main.py index 80f8bfd3..016f1121 100644 --- a/divio_cli/localdev/main.py +++ b/divio_cli/localdev/main.py @@ -368,7 +368,6 @@ def restore_db(self): ) restore_command = self.get_db_restore_command() - # TODO: use same dump-type detection like server side on db-api try: subprocess.call( @@ -471,8 +470,10 @@ def setup(self): db_dump_path = download_file(download_url, directory=self.path) click.echo(" [{}s]".format(int(time() - start_download))) # strip path from dump_path for use in the docker container - self.db_dump_path = "/app/{}".format( - db_dump_path.replace(self.path, "") + self.db_dump_path = os.path.join( + os.sep, + 'app', + db_dump_path.replace(self.path, "").replace("/", ""), ) def get_db_restore_command(self): @@ -594,7 +595,7 @@ def dump_database(dump_filename, archive_filename=None): "--no-owner", "--no-privileges", "-f", - os.path.join("/app/", dump_filename), + os.path.join(os.sep, "app", dump_filename), ), env=get_subprocess_env(), )