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

Fix reporting of repo patch IDs

Browse Source 
We were always printing the ID of the last patch of a repo because the
application loop only iterated over a set of patch paths, not the patch
entries. Fix that be assembling a tuple of path and ID in my_patches.

Reported-by: Mustafa Yuecel <mustafa.yuecel@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2020-04-10 18:10:17 +02:00
parent 1c1e3e592a
commit 2142fd855e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kas/repos.py
View File

@ -271,7 +271,7 @@ class RepoImpl(Repo):
cmd = [] cmd = []
if os.path.isfile(path): if os.path.isfile(path):
my_patches.append(path) my_patches.append((path, patch['id']))
elif (os.path.isdir(path) elif (os.path.isdir(path)
and os.path.isfile(os.path.join(path, 'series'))): and os.path.isfile(os.path.join(path, 'series'))):
with open(os.path.join(path, 'series')) as f: with open(os.path.join(path, 'series')) as f:
@ -280,7 +280,7 @@ class RepoImpl(Repo):
continue continue
p = os.path.join(path, line.split(' #')[0].rstrip()) p = os.path.join(path, line.split(' #')[0].rstrip())
if os.path.isfile(p): if os.path.isfile(p):
my_patches.append(p) my_patches.append((p, patch['id']))
else: else:
raise FileNotFoundError(p) raise FileNotFoundError(p)
else: else:
@ -291,19 +291,19 @@ class RepoImpl(Repo):
patch['id']) patch['id'])
return 1 return 1
for path in my_patches: for (path, patch_id) in my_patches:
cmd = self.apply_patches_file_cmd(path) cmd = self.apply_patches_file_cmd(path)
(retc, output) = await run_cmd_async(cmd, cwd=self.path) (retc, output) = await run_cmd_async(cmd, cwd=self.path)
if retc: if retc:
logging.error('Could not apply patch. Please fix repos and ' logging.error('Could not apply patch. Please fix repos and '
'patches. (patch path: %s, repo: %s, patch ' 'patches. (patch path: %s, repo: %s, patch '
'entry: %s, vcs output: %s)', 'entry: %s, vcs output: %s)',
path, self.name, patch['id'], output) path, self.name, patch_id, output)
return 1 return 1
else: else:
logging.info('Patch applied. ' logging.info('Patch applied. '
'(patch path: %s, repo: %s, patch entry: %s)', '(patch path: %s, repo: %s, patch entry: %s)',
path, self.name, patch['id']) path, self.name, patch_id)
cmd = self.add_cmd() cmd = self.add_cmd()
(retc, output) = await run_cmd_async(cmd, cwd=self.path) (retc, output) = await run_cmd_async(cmd, cwd=self.path)