diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-27 08:07:06 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-27 08:07:06 -0500 |
| commit | 9a25f805557936cb3117ea38366abe619268db30 (patch) | |
| tree | 83531c005f83daee4e14bc86b9fd2bb90beee978 | |
| parent | ae2a2bdcaebf49b631865a6aa7d29c91654e9799 (diff) | |
| parent | 12c2b9cd2bec17ffe09863abed97876b10da88ed (diff) | |
| download | bcfg2-9a25f805557936cb3117ea38366abe619268db30.tar.gz bcfg2-9a25f805557936cb3117ea38366abe619268db30.tar.bz2 bcfg2-9a25f805557936cb3117ea38366abe619268db30.zip | |
Merge pull request #223 from AlexanderS/fix-keyboard-interrupt
fix keyboard interrupt during intial event handling
| -rw-r--r-- | src/lib/Bcfg2/Server/FileMonitor/__init__.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/FileMonitor/__init__.py b/src/lib/Bcfg2/Server/FileMonitor/__init__.py index 52c3906fa..7a5d901fd 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/__init__.py +++ b/src/lib/Bcfg2/Server/FileMonitor/__init__.py @@ -234,6 +234,8 @@ class FileMonitor(Debuggable): self.handles[event.requestID])) try: self.handles[event.requestID].HandleEvent(event) + except KeyboardInterrupt: + raise except: # pylint: disable=W0702 err = sys.exc_info()[1] LOGGER.error("Error in handling of event %s for %s: %s" % diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index d08c7d285..538215c85 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -364,7 +364,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable): # pylint: disable=R0902 if os.path.exists(self.cachefile): try: self.load_state() - except: + except (OSError, cPickle.UnpicklingError): err = sys.exc_info()[1] self.logger.error("Packages: Cachefile %s load failed: %s" % (self.cachefile, err)) |