SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Handle --keep-config-unchanged with existing skip mechanism

Browse Source 
This makes the body of the Shell.run function closely match Build.run so
that we can factor out common code.

Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Paul Barker 2020-11-13 19:34:50 +01:00 committed by Jan Kiszka
parent c408e89ef1
commit 451a51f94a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kas/plugins/shell.py
View File

@ -82,11 +82,20 @@ class Shell:
ctx = create_global_context(args)
ctx.config = Config(args.config)
if args.keep_config_unchanged:
# Skip the tasks which would change the config of the build
# environment
args.skip += [
'setup_dir',
'finish_setup_repos',
'repos_apply_patches',
'write_bbconfig',
]
macro = Macro()
# Prepare
if not args.keep_config_unchanged:
macro.add(SetupDir())
macro.add(SetupDir())
if 'SSH_PRIVATE_KEY' in os.environ:
macro.add(SetupSSHAgent())
@ -97,15 +106,13 @@ class Shell:
repo_loop.add(SetupReposStep())
macro.add(repo_loop)
if not args.keep_config_unchanged:
macro.add(FinishSetupRepos())
macro.add(FinishSetupRepos())
macro.add(SetupEnviron())
macro.add(SetupHome())
macro.add(ReposApplyPatches())
if not args.keep_config_unchanged:
macro.add(ReposApplyPatches())
macro.add(WriteBBConfig())
macro.add(WriteBBConfig())
# Shell
macro.add(ShellCommand(args.command))