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

shell: Honor SSH_PRIVATE_KEY environment variable

Browse Source 
Signed-off-by: Daniel Wagner <daniel.wagner@siemens.com>
This commit is contained in:
Daniel Wagner 2018-01-08 16:46:16 +01:00
parent bef5aa80b3
commit 415e0bf114
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kas/shell.py
View File

@ -25,6 +25,7 @@
""" """
import subprocess import subprocess
import os
from kas.libkas import kasplugin from kas.libkas import kasplugin
from kas.config import Config from kas.config import Config
from kas.libcmds import (Macro, Command, SetupDir, SetupProxy, SetupEnviron, from kas.libcmds import (Macro, Command, SetupDir, SetupProxy, SetupEnviron,
@ -77,21 +78,29 @@ class Shell:
macro = Macro() macro = Macro()
# Prepare
if not args.keep_config_unchanged: if not args.keep_config_unchanged:
macro.add(SetupDir()) macro.add(SetupDir())
macro.add(SetupProxy()) macro.add(SetupProxy())
macro.add(SetupEnviron()) macro.add(SetupEnviron())
if 'SSH_PRIVATE_KEY' in os.environ:
macro.add(SetupSSHAgent())
if not args.keep_config_unchanged: if not args.keep_config_unchanged:
macro.add(ReposFetch()) macro.add(ReposFetch())
macro.add(ReposCheckout()) macro.add(ReposCheckout())
macro.add(SetupEnviron()) macro.add(SetupEnviron())
macro.add(WriteConfig()) macro.add(WriteConfig())
# Shell
macro.add(SetupHome()) macro.add(SetupHome())
macro.add(ShellCommand(args.command)) macro.add(ShellCommand(args.command))
if 'SSH_PRIVATE_KEY' in os.environ:
macro.add(CleanupSSHAgent())
macro.run(cfg, args.skip) macro.run(cfg, args.skip)
return True return True