Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix null pointer dereference in koschei-scheduler-hotfix.patch

Browse source
This commit is contained in:
Mikolaj Izdebski 2017-06-13 20:25:59 +00:00
parent ff4be42ff1
commit 76a943ec11
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
roles/koschei/backend/files/koschei-scheduler-hotfix.patch
View file

@ -1,5 +1,5 @@
--- /usr/lib/python2.7/site-packages/koschei/backend/__init__.py~ 2017-06-13 21:31:05.170580184 +0200 --- /usr/lib/python2.7/site-packages/koschei/backend/__init__.py~ 2017-06-13 21:31:05.170580184 +0200
+++ /usr/lib/python2.7/site-packages/koschei/backend/__init__.py 2017-06-13 22:16:19.333831662 +0200 +++ /usr/lib/python2.7/site-packages/koschei/backend/__init__.py 2017-06-13 22:24:19.798558738 +0200
@@ -94,13 +94,15 @@ @@ -94,13 +94,15 @@
return self._repo_cache return self._repo_cache
@ -11,10 +11,11 @@
name = package.name name = package.name
build_opts = {} build_opts = {}
- if package.arch_override: - if package.arch_override:
+ if True: - override = package.arch_override
override = package.arch_override + override = package.arch_override
+ if not override and 'noarch' not in arches: + if not override and 'noarch' not in arches:
+ override = '^' + override = '^'
+ if override:
if override.startswith('^'): if override.startswith('^'):
excludes = override[1:].split() excludes = override[1:].split()
build_arches = get_config('koji_config').get('build_arches') build_arches = get_config('koji_config').get('build_arches')