From ccf1c412747230b080828c3dec88e0eb5f70e363 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Feb 12 2019 21:09:19 +0000 Subject: fixes --- diff --git a/builder/kojid b/builder/kojid index 251b8f7..3bdac89 100755 --- a/builder/kojid +++ b/builder/kojid @@ -1279,7 +1279,7 @@ class BuildArchTask(BaseBuildTask): # peel E:N-V-R from package h = koji.get_rpm_header(fn) name = koji.get_header_field(h, 'name') - if koji.get_header_field('sourcepackage'): + if not koji.get_header_field(h, 'sourcepackage'): raise koji.BuildError("not a source package") # Disable checking for distribution in the initial SRPM because it # might have been built outside of the build system diff --git a/koji/daemon.py b/koji/daemon.py index 6035b73..0ac5f4b 100644 --- a/koji/daemon.py +++ b/koji/daemon.py @@ -802,14 +802,14 @@ class TaskManager(object): #about). This will happen after a daemon restart, for example. self.logger.info("freeing stale tasks: %r" % stale) self.session.host.freeTasks(stale) - for id, pid in self.pids.items(): + for id, pid in list(self.pids.items()): if self._waitTask(id, pid): # the subprocess handles most everything, we just need to clear things out if self.cleanupTask(id, wait=False): del self.pids[id] if id in self.tasks: del self.tasks[id] - for id, pid in self.pids.items(): + for id, pid in list(self.pids.items()): if id not in tasks: # expected to happen when: # - we are in the narrow gap between the time the task