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

kojivmd: py3 compatibility issues

Browse source 
Fixes: https://pagure.io/koji/issue/3059
This commit is contained in:
Tomas Kopecek 2021-09-30 12:39:23 +02:00
parent 20d9de426d
commit 73399e517c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vm/kojivmd
View file

@ -746,7 +746,7 @@ class VMExecTask(BaseTaskHandler):
try: try:
fileobj.seek(offset) fileobj.seek(offset)
data = fileobj.read(length) data = fileobj.read(length)
encoded = base64.b64encode(data) encoded = base64.b64encode(data).decode()
del data del data
return encoded return encoded
finally: finally:
@ -1081,7 +1081,7 @@ class VMTaskManager(TaskManager):
self.cleanupVM(vm_name) self.cleanupVM(vm_name)
def cleanupExpiredVMs(self): def cleanupExpiredVMs(self):
for vm_name, task in self.expired_vms.items(): for vm_name, task in list(self.expired_vms.items()):
if task['state'] == koji.TASK_STATES['FAILED']: if task['state'] == koji.TASK_STATES['FAILED']:
if time.time() - task['completion_ts'] < 3600 * 4: if time.time() - task['completion_ts'] < 3600 * 4:
# task failed, so we'll keep the VM image around for 4 hours # task failed, so we'll keep the VM image around for 4 hours
@ -1097,7 +1097,7 @@ class VMTaskManager(TaskManager):
self.macaddr_lock.acquire() self.macaddr_lock.acquire()
try: try:
if ret: if ret:
for macaddr, (vm_name, id, port) in self.macaddrs.items(): for macaddr, (vm_name, id, port) in list(self.macaddrs.items()):
if task_id == id: if task_id == id:
self.expired_vms[vm_name] = self.session.getTaskInfo(task_id) self.expired_vms[vm_name] = self.session.getTaskInfo(task_id)
del self.macaddrs[macaddr] del self.macaddrs[macaddr]