diff --git a/cylc/flow/scripts/install.py b/cylc/flow/scripts/install.py index f58fcc542f4..d44908ca626 100755 --- a/cylc/flow/scripts/install.py +++ b/cylc/flow/scripts/install.py @@ -271,11 +271,11 @@ def install_cli( reg: Optional[str] = None ) -> str: """Install workflow and scan for already-running instances.""" - wf_name = install(opts, reg) + wf_name, wf_id = install(opts, reg) asyncio.run( scan(wf_name, not opts.no_ping) ) - return wf_name + return wf_name, wf_id def install( @@ -306,7 +306,7 @@ def install( elif opts.symlink_dirs: cli_symdirs = parse_cli_sym_dirs(opts.symlink_dirs) - source_dir, rundir, workflow_name = install_workflow( + source_dir, rundir, workflow_name, workflow_id = install_workflow( source=source, workflow_name=opts.workflow_name, run_name=opts.run_name, @@ -331,4 +331,5 @@ def install( entry_point.name, exc ) from None - return workflow_name + + return workflow_name, workflow_id diff --git a/cylc/flow/scripts/validate_install_play.py b/cylc/flow/scripts/validate_install_play.py index 25f6e805b5e..655d101a369 100644 --- a/cylc/flow/scripts/validate_install_play.py +++ b/cylc/flow/scripts/validate_install_play.py @@ -95,7 +95,7 @@ def main(parser: COP, options: 'Values', workflow_id: Optional[str] = None): validate_main(parser, options, str(source)) log_subcommand('install', source) - workflow_id = cylc_install(options, workflow_id) + _, workflow_id = cylc_install(options, workflow_id) cleanup_sysargv( 'play', diff --git a/cylc/flow/workflow_files.py b/cylc/flow/workflow_files.py index 3667206812d..398561ec79b 100644 --- a/cylc/flow/workflow_files.py +++ b/cylc/flow/workflow_files.py @@ -1751,7 +1751,7 @@ def install_workflow( install_log.info(f'INSTALLED {named_run} from {source}') print(f'INSTALLED {named_run} from {source}') close_log(install_log) - return source, rundir, named_run + return source, rundir, workflow_name, named_run def get_run_dir_info(