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

flake8: apply all rest E7 rules

Browse source
This commit is contained in:
Yuming Zhu 2020-02-26 04:49:48 +08:00
parent 6ed30954b2
commit f1ba6cefd7
24 changed files with 112 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vm/kojikamid.py
View file

@ -687,7 +687,7 @@ def stream_logs(server, handler, builds):
try:
fd = open(log, 'r')
logs[log] = (relpath, fd)
except:
except BaseException:
log_local('Error opening %s' % log)
continue
else:
@ -701,7 +701,7 @@ def stream_logs(server, handler, builds):
del contents
try:
server.uploadDirect(relpath, offset, size, digest, data)
except:
except BaseException:
log_local('error uploading %s' % relpath)
time.sleep(1)
@ -717,14 +717,14 @@ def fail(server, handler):
logfd.flush()
upload_file(server, os.path.dirname(logfile),
os.path.basename(logfile))
except:
except BaseException:
log_local('error calling upload_file()')
while True:
try:
# this is the very last thing we do, keep trying as long as we can
server.failTask(tb)
break
except:
except BaseException:
log_local('error calling server.failTask()')
sys.exit(1)
@ -794,7 +794,7 @@ def main():
results['logs'].append(os.path.basename(logfile))
server.closeTask(results)
except:
except BaseException:
fail(server, handler)
sys.exit(0)

12
vm/kojivmd
View file

@ -241,7 +241,7 @@ def main(options, session):
break
except koji.RetryError:
raise
except:
except BaseException:
# XXX - this is a little extreme
# log the exception and continue
logger.error('Error in main loop', exc_info=True)
@ -293,7 +293,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
self.close_request(conn)
except socket.timeout:
pass
except:
except BaseException:
self.logger.error('Error handling requests', exc_info=True)
if sys.version_info[:2] <= (2, 4):
@ -310,7 +310,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
response = six.moves.xmlrpc_client.dumps(response, methodresponse=1, allow_none=True)
except six.moves.xmlrpc_client.Fault as fault:
response = six.moves.xmlrpc_client.dumps(fault)
except:
except BaseException:
# report exception back to server
response = six.moves.xmlrpc_client.dumps(
six.moves.xmlrpc_client.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))
@ -407,7 +407,7 @@ class WinBuildTask(MultiPlatformTask):
except (SystemExit, ServerExit, KeyboardInterrupt):
# we do not trap these
raise
except:
except BaseException:
if not opts.get('scratch'):
# scratch builds do not get imported
self.session.host.failBuild(self.id, build_id)
@ -1037,7 +1037,7 @@ class VMTaskManager(TaskManager):
if os.path.isfile(disk):
os.unlink(disk)
self.logger.debug('Removed disk file %s for VM %s', disk, vm_name)
except:
except BaseException:
self.logger.error('Error removing disk file %s for VM %s', disk, vm_name,
exc_info=True)
return False
@ -1054,7 +1054,7 @@ class VMTaskManager(TaskManager):
"""
vms = self.libvirt_conn.listDefinedDomains() + self.libvirt_conn.listDomainsID()
for vm_name in vms:
if type(vm_name) == int:
if isinstance(vm_name, int):
vm_name = self.libvirt_conn.lookupByID(vm_name).name()
if vm_name.startswith(VMExecTask.CLONE_PREFIX):
self.cleanupVM(vm_name)