PR#4274: Don't prepopulate log list for mavenBuild
Merges #4274 https://pagure.io/koji/pull-request/4274 Fixes: #4273 https://pagure.io/koji/issue/4273 mavenBuild now fails on missing log files
This commit is contained in:
commit
fccf4fa3f9
1 changed files with 7 additions and 4 deletions
|
|
@ -2033,9 +2033,7 @@ class BuildMavenTask(BaseBuildTask):
|
|||
os.path.join(outputdir, maven_info['artifact_id'] + '-' +
|
||||
maven_info['version'] + '-patches.zip'))
|
||||
|
||||
logs = ['checkout.log']
|
||||
if self.opts.get('patches'):
|
||||
logs.append('patches.log')
|
||||
logs = []
|
||||
output_files = {}
|
||||
|
||||
for path, dirs, files in os.walk(outputdir):
|
||||
|
|
@ -2058,9 +2056,14 @@ class BuildMavenTask(BaseBuildTask):
|
|||
self.uploadFile(os.path.join(outputdir, relpath, filename),
|
||||
relPath=relpath)
|
||||
|
||||
# Also include the logs already upload by BuildRoot
|
||||
# Also include the logs already uploaded by BuildRoot
|
||||
logs.extend(buildroot.logs)
|
||||
|
||||
# Also include the checkout logs (uploaded during checkout)
|
||||
logs.append('checkout.log')
|
||||
if self.opts.get('patches'):
|
||||
logs.append('patches.log')
|
||||
|
||||
buildroot.expire()
|
||||
|
||||
return {'maven_info': maven_info,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue