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

libkas: do not use absolute paths when executing programs

Browse Source 
Using absolute paths breaks on systems that place the binaries in
another directory and it defeats local overlays with PATH.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
This commit is contained in:
Henning Schild 2017-09-08 17:09:22 +02:00 committed by Daniel Wagner
parent aa3d109f0b
commit d06bdc4781
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kas/config.py
View File

@ -394,7 +394,7 @@ class ConfigStatic(Config):
if path is None: if path is None:
# In-tree configuration # In-tree configuration
path = os.path.dirname(self.filename) path = os.path.dirname(self.filename)
(ret, output) = run_cmd(['/usr/bin/git', (ret, output) = run_cmd(['git',
'rev-parse', 'rev-parse',
'--show-toplevel'], '--show-toplevel'],
cwd=path, cwd=path,

20
kas/libkas.py
View File

@ -167,7 +167,7 @@ def _repo_fetch_async(config, repo):
repo.qualified_name) repo.qualified_name)
logging.debug('Looking for repo ref dir in %s', gitsrcdir) logging.debug('Looking for repo ref dir in %s', gitsrcdir)
cmd = ['/usr/bin/git', 'clone', '-q', repo.url, repo.path] cmd = ['git', 'clone', '-q', repo.url, repo.path]
if config.get_repo_ref_dir() and os.path.exists(gitsrcdir): if config.get_repo_ref_dir() and os.path.exists(gitsrcdir):
cmd.extend(['--reference', gitsrcdir]) cmd.extend(['--reference', gitsrcdir])
(retc, _) = yield from run_cmd_async(cmd, (retc, _) = yield from run_cmd_async(cmd,
@ -178,7 +178,7 @@ def _repo_fetch_async(config, repo):
return retc return retc
# Does refspec exist in the current repository? # Does refspec exist in the current repository?
(retc, output) = yield from run_cmd_async(['/usr/bin/git', (retc, output) = yield from run_cmd_async(['git',
'cat-file', '-t', 'cat-file', '-t',
repo.refspec], repo.refspec],
env=config.environ, env=config.environ,
@ -191,7 +191,7 @@ def _repo_fetch_async(config, repo):
return retc return retc
# No it is missing, try to fetch # No it is missing, try to fetch
(retc, output) = yield from run_cmd_async(['/usr/bin/git', (retc, output) = yield from run_cmd_async(['git',
'fetch', '--all'], 'fetch', '--all'],
env=config.environ, env=config.environ,
cwd=repo.path, cwd=repo.path,
@ -233,7 +233,7 @@ def repo_checkout(config, repo):
return return
# Check if repos is dirty # Check if repos is dirty
(_, output) = run_cmd(['/usr/bin/git', 'diff', '--shortstat'], (_, output) = run_cmd(['git', 'diff', '--shortstat'],
env=config.environ, cwd=repo.path, env=config.environ, cwd=repo.path,
fail=False) fail=False)
if output: if output:
@ -241,7 +241,7 @@ def repo_checkout(config, repo):
return return
# Check if current HEAD is what in the config file is defined. # Check if current HEAD is what in the config file is defined.
(_, output) = run_cmd(['/usr/bin/git', 'rev-parse', (_, output) = run_cmd(['git', 'rev-parse',
'--verify', 'HEAD'], '--verify', 'HEAD'],
env=config.environ, cwd=repo.path) env=config.environ, cwd=repo.path)
@ -250,7 +250,7 @@ def repo_checkout(config, repo):
'refspec. nothing to do', repo.name) 'refspec. nothing to do', repo.name)
return return
run_cmd(['/usr/bin/git', 'checkout', '-q', run_cmd(['git', 'checkout', '-q',
'{refspec}'.format(refspec=repo.refspec)], '{refspec}'.format(refspec=repo.refspec)],
cwd=repo.path) cwd=repo.path)
@ -326,7 +326,7 @@ def ssh_add_key(env, key):
""" """
Add ssh key to the ssh-agent Add ssh key to the ssh-agent
""" """
process = Popen(['/usr/bin/ssh-add', '-'], stdin=PIPE, stdout=None, process = Popen(['ssh-add', '-'], stdin=PIPE, stdout=None,
stderr=PIPE, env=env) stderr=PIPE, env=env)
(_, error) = process.communicate(input=str.encode(key)) (_, error) = process.communicate(input=str.encode(key))
if process.returncode and error: if process.returncode and error:
@ -338,13 +338,13 @@ def ssh_cleanup_agent(config):
Removes the identities and stop the ssh-agent instance Removes the identities and stop the ssh-agent instance
""" """
# remove the identities # remove the identities
process = Popen(['/usr/bin/ssh-add', '-D'], env=config.environ) process = Popen(['ssh-add', '-D'], env=config.environ)
process.wait() process.wait()
if process.returncode != 0: if process.returncode != 0:
logging.error('failed to delete SSH identities') logging.error('failed to delete SSH identities')
# stop the ssh-agent # stop the ssh-agent
process = Popen(['/usr/bin/ssh-agent', '-k'], env=config.environ) process = Popen(['ssh-agent', '-k'], env=config.environ)
process.wait() process.wait()
if process.returncode != 0: if process.returncode != 0:
logging.error('failed to stop SSH agent') logging.error('failed to stop SSH agent')
@ -355,7 +355,7 @@ def ssh_setup_agent(config, envkeys=None):
Starts the ssh-agent Starts the ssh-agent
""" """
envkeys = envkeys or ['SSH_PRIVATE_KEY'] envkeys = envkeys or ['SSH_PRIVATE_KEY']
output = os.popen('/usr/bin/ssh-agent -s').readlines() output = os.popen('ssh-agent -s').readlines()
for line in output: for line in output:
matches = re.search(r"(\S+)\=(\S+)\;", line) matches = re.search(r"(\S+)\=(\S+)\;", line)
if matches: if matches: