use Exception instead of BaseException for bare expection

vm/kojikamid.py

@@ -699,7 +699,7 @@ def stream_logs(server, handler, builds):
                     try:
                         fd = open(log, 'r')
                         logs[log] = (relpath, fd)
-                    except BaseException:
+                    except Exception:
                         log_local('Error opening %s' % log)
                         continue
                 else:
@@ -713,7 +713,7 @@ def stream_logs(server, handler, builds):
                 del contents
                 try:
                     server.uploadDirect(relpath, offset, size, digest, data)
-                except BaseException:
+                except Exception:
                     log_local('error uploading %s' % relpath)
         time.sleep(1)
 
@@ -729,14 +729,14 @@ def fail(server, handler):
             logfd.flush()
             upload_file(server, os.path.dirname(logfile),
                         os.path.basename(logfile))
-        except BaseException:
+        except Exception:
             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 BaseException:
+            except Exception:
                 log_local('error calling server.failTask()')
     sys.exit(1)
 
@@ -806,7 +806,7 @@ def main():
         results['logs'].append(os.path.basename(logfile))
 
         server.closeTask(results)
-    except BaseException:
+    except Exception:
         fail(server, handler)
     sys.exit(0)
 

vm/kojivmd

@@ -241,7 +241,7 @@ def main(options, session):
             break
         except koji.RetryError:
             raise
-        except BaseException:
+        except Exception:
             # XXX - this is a little extreme
             # log the exception and continue
             logger.error('Error in main loop', exc_info=True)
@@ -295,7 +295,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
                         self.close_request(conn)
             except socket.timeout:
                 pass
-            except BaseException:
+            except Exception:
                 self.logger.error('Error handling requests', exc_info=True)
 
     if sys.version_info[:2] <= (2, 4):
@@ -313,7 +313,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
                                                          methodresponse=1, allow_none=True)
             except six.moves.xmlrpc_client.Fault as fault:
                 response = six.moves.xmlrpc_client.dumps(fault)
-            except BaseException:
+            except Exception:
                 # report exception back to server
                 response = six.moves.xmlrpc_client.dumps(
                     six.moves.xmlrpc_client.Fault(
@@ -415,7 +415,7 @@ class WinBuildTask(MultiPlatformTask):
         except (SystemExit, ServerExit, KeyboardInterrupt):
             # we do not trap these
             raise
-        except BaseException:
+        except Exception:
             if not opts.get('scratch'):
                 # scratch builds do not get imported
                 self.session.host.failBuild(self.id, build_id)
@@ -1056,7 +1056,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 BaseException:
+            except Exception:
                 self.logger.error('Error removing disk file %s for VM %s', disk, vm_name,
                                   exc_info=True)
                 return False