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

flake8: apply E1 rules

Browse source
This commit is contained in:
Yuming Zhu 2020-02-26 02:08:41 +08:00
parent 450f9249cd
commit ce1f9928af
30 changed files with 958 additions and 958 deletions
Download patch file Download diff file Expand all files Collapse all files

34
vm/kojivmd
View file

@ -98,7 +98,7 @@ def get_options():
parser.add_option("--maxjobs", type='int', help="Specify maxjobs")
parser.add_option("--sleeptime", type='int', help="Specify the polling interval")
parser.add_option("--admin-emails", type='str', action="store", metavar="EMAILS",
help="Comma-separated addresses to send error notices to.")
help="Comma-separated addresses to send error notices to.")
parser.add_option("--workdir", help="Specify workdir")
parser.add_option("--pluginpath", help="Specify plugin search path")
parser.add_option("--plugin", action="append", help="Load specified plugin")
@ -266,7 +266,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False)
else:
six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False,
allow_none=True)
allow_none=True)
self.logger = logging.getLogger('koji.vm.DaemonXMLRPCServer')
self.socket.settimeout(5)
self.active = True
@ -308,7 +308,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
# 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))
)
)
return response
@ -350,7 +350,7 @@ class WinBuildTask(MultiPlatformTask):
'build_tag' : build_tag['id'],
'skip_tag' : bool(opts.get('skip_tag')),
'target': target_info['id']
}
}
if not opts.get('skip_tag'):
policy_data['tag'] = dest_tag['id']
self.session.host.assertPolicy('build_from_repo_id', policy_data)
@ -378,10 +378,10 @@ class WinBuildTask(MultiPlatformTask):
# Make sure package is on the list for this tag
if pkg_cfg is None:
raise koji.BuildError("package %s not in list for tag %s" \
% (build_info['name'], dest_tag['name']))
% (build_info['name'], dest_tag['name']))
elif pkg_cfg['blocked']:
raise koji.BuildError("package %s is blocked for tag %s" \
% (build_info['name'], dest_tag['name']))
% (build_info['name'], dest_tag['name']))
build_info = self.session.host.initWinBuild(self.id, build_info,
koji.util.dslice(results, ['platform']))
@ -430,7 +430,7 @@ class VMExecTask(BaseTaskHandler):
def __init__(self, *args, **kw):
super(VMExecTask, self).__init__(*args, **kw)
self.task_manager = six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' % (self.options.privaddr, self.options.portbase),
allow_none=True)
allow_none=True)
self.port = None
self.server = None
self.task_info = None
@ -450,7 +450,7 @@ class VMExecTask(BaseTaskHandler):
ret = proc.wait()
if ret:
raise koji.BuildError('unable to create qcow2 image, "%s" returned %s; output was: %s' % \
(' '.join(cmd), ret, output))
(' '.join(cmd), ret, output))
vm_user = pwd.getpwnam(self.options.vmuser)
os.chown(new_path, vm_user.pw_uid, vm_user.pw_gid)
return new_path
@ -680,13 +680,13 @@ class VMExecTask(BaseTaskHandler):
remote_pi = koji.PathInfo(self.options.topurl)
if type == 'rpm':
remote_url = remote_pi.build(buildinfo) + '/' + \
fileinfo['localpath']
fileinfo['localpath']
elif type == 'maven':
remote_url = remote_pi.mavenbuild(buildinfo) + '/' + \
fileinfo['localpath']
fileinfo['localpath']
elif type == 'win':
remote_url = remote_pi.winbuild(buildinfo) + '/' + \
fileinfo['localpath']
fileinfo['localpath']
else:
raise koji.BuildError('unsupported file type: %s' % type)
koji.ensuredir(os.path.dirname(localpath))
@ -706,7 +706,7 @@ class VMExecTask(BaseTaskHandler):
fileinfo['payloadhash'], payloadhash))
if not koji.util.check_sigmd5(localpath):
raise koji.BuildError("Downloaded rpm %s doesn't match sigmd5" % \
os.path.basename(fileinfo['localpath']))
os.path.basename(fileinfo['localpath']))
else:
self.verifyChecksum(localpath, fileinfo['checksum'], koji.CHECKSUM_TYPES[fileinfo['checksum_type']])
@ -746,7 +746,7 @@ class VMExecTask(BaseTaskHandler):
size = os.path.getsize(local_path)
if offset != size:
raise koji.BuildError('cannot write to %s at offset %s, size is %s' % \
(local_path, offset, size))
(local_path, offset, size))
fobj = open(local_path, 'r+')
fobj.seek(offset)
data = base64.b64decode(contents)
@ -790,7 +790,7 @@ class VMExecTask(BaseTaskHandler):
return True
else:
raise koji.BuildError('%s checksum validation failed for %s, %s (computed) != %s (provided)' % \
(algo, local_path, sum.hexdigest(), checksum))
(algo, local_path, sum.hexdigest(), checksum))
def closeTask(self, output):
self.output = output
@ -855,7 +855,7 @@ class VMExecTask(BaseTaskHandler):
except libvirt.libvirtError as e:
self.logger.error('error starting VM %s', clone_name, exc_info=True)
raise koji.PreBuildError('error starting VM %s, error was: %s' % \
(clone_name, e))
(clone_name, e))
start = time.time()
while True:
@ -873,7 +873,7 @@ class VMExecTask(BaseTaskHandler):
vm.destroy()
self.server.server_close()
raise koji.BuildError('Task did not complete after %.2f minutes, VM %s has been destroyed' % \
(mins, clone_name))
(mins, clone_name))
else:
vm.destroy()
self.server.server_close()
@ -941,7 +941,7 @@ class VMTaskManager(TaskManager):
for node in nodelist:
disk = node.prop('file')
if os.path.basename(disk).startswith(VMExecTask.CLONE_PREFIX) and \
disk.endswith(VMExecTask.QCOW2_EXT):
disk.endswith(VMExecTask.QCOW2_EXT):
disks.append(disk)
ctx.xpathFreeContext()
doc.freeDoc()