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

depress Exception when checking mergerepo_c version

Browse source
This commit is contained in:
Yu Ming Zhu 2020-07-15 17:54:21 +00:00 • committed by Mike McLean
parent cccd7f06a3
commit a02762bc7f
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
builder/kojid
View file

@ -5511,10 +5511,14 @@ class CreaterepoTask(BaseTaskHandler):
def _get_mergerepo_c_version(self):
cmd = ['/usr/bin/mergerepo_c', '--version']
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
out, _ = proc.communicate()
status = proc.wait()
if status != 0:
try:
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
out, _ = proc.communicate()
status = proc.wait()
if status != 0:
self.logger.warning("Unable to detect mergerepo_c version")
return None
except Exception:
self.logger.warning("Unable to detect mergerepo_c version")
return None
out = out.decode().strip()