Merge commit 'origin' into mead

builder/kojid

@@ -732,7 +732,8 @@ class TaskManager(object):
                         else:
                             self.logger.warn("%s: %s" % (desc, e))
                             continue
-                    age = min(age, time.time() - st.st_mtime)
+                    else:
+                        age = min(age, time.time() - st.st_mtime)
                 #note: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=192153)
                 #If rpmlib is installing in this chroot, removing it entirely
                 #can lead to a world of hurt.

koji/__init__.py

@@ -1039,7 +1039,9 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
         # Use the group data rather than a generated rpm
         'chroot_setup_cmd': 'groupinstall build',
         # don't encourage network access from the chroot
-        'use_host_resolv': False
+        'use_host_resolv': False,
+        # Don't let a build last more than 24 hours
+        'rpmbuild_timeout': 86400
     }
 
     config_opts['yum.conf'] = """[main]