From d39929b40525bd714367138712f71f5a1f60eaab Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 18 Jun 2019 16:23:41 +1200 Subject: [PATCH] dockersetup: do not set site name if a database file is specified If a database file is specified we probably want to stick with whatever site name is defined in there and not overwrite it. Signed-off-by: Paul Eggleton --- dockersetup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dockersetup.py b/dockersetup.py index 43fc5b0..0fb322f 100755 --- a/dockersetup.py +++ b/dockersetup.py @@ -708,8 +708,9 @@ if return_code != 0: sys.exit(1) if not updatemode: - ## Set site name - return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', '/opt/layerindex/layerindex/tools/site_name.py', hostname, 'OpenEmbedded Layer Index'], shell=False) + if not dbfile: + ## Set site name + return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', '/opt/layerindex/layerindex/tools/site_name.py', hostname, 'OpenEmbedded Layer Index'], shell=False) ## For a fresh database, create an admin account print("Creating database superuser. Input user name and password when prompted.")