particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ensure macros and env values passed to mock are strings

Browse source
This commit is contained in:
Mike McLean 2024-11-20 13:03:19 -05:00 • committed by Tomas Kopecek
parent 9e0d9612c9
commit d9795530d7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builder/kojid
View file

@ -332,9 +332,9 @@ class BuildRoot(object):
for key in self.config['extra']: for key in self.config['extra']:
if key.startswith('rpm.macro.'): if key.startswith('rpm.macro.'):
macro = '%' + key[10:] macro = '%' + key[10:]
opts['tag_macros'][macro] = self.config['extra'][key] opts['tag_macros'][macro] = str(self.config['extra'][key])
elif key.startswith('rpm.env.'): elif key.startswith('rpm.env.'):
opts['tag_envvars'][key[8:]] = self.config['extra'][key] opts['tag_envvars'][key[8:]] = str(self.config['extra'][key])
if 'mock.use_bootstrap' in self.config['extra']: if 'mock.use_bootstrap' in self.config['extra']:
opts['use_bootstrap'] = bool(self.config['extra']['mock.use_bootstrap']) opts['use_bootstrap'] = bool(self.config['extra']['mock.use_bootstrap'])