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

repos: Fail on unsuccessful patching

Browse Source 
There is no good reason to only warn about an incorrect patch entry or
a missing patch file. This just causes CI systems to succeed with a
build - or fail at unexpected places.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Daniel Wagner <daniel.wagner@siemens.com>
This commit is contained in:
Jan Kiszka 2019-02-02 12:30:16 +01:00 committed by Daniel Wagner
parent 2f7650bb05
commit 2f24bdeac2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kas/repos.py
View File

@ -239,13 +239,13 @@ class RepoImpl(Repo):
None)
if not other_repo:
logging.warning('Could not find referenced repo. '
'(missing repo: %s, repo: %s, '
'patch entry: %s)',
patch['repo'],
self.name,
patch['id'])
continue
logging.error('Could not find referenced repo. '
'(missing repo: %s, repo: %s, '
'patch entry: %s)',
patch['repo'],
self.name,
patch['id'])
return 1
path = os.path.join(other_repo.path, patch['path'])
cmd = []
@ -255,12 +255,12 @@ class RepoImpl(Repo):
elif os.path.isdir(path):
cmd = self.apply_patches_quilt_cmd(path)
else:
logging.warning('Could not find patch. '
'(patch path: %s, repo: %s, patch entry: %s)',
path,
self.name,
patch['id'])
continue
logging.error('Could not find patch. '
'(patch path: %s, repo: %s, patch entry: %s)',
path,
self.name,
patch['id'])
return 1
(retc, output) = yield from run_cmd_async(cmd,
cwd=self.path,