From b18ccc2952ebdbb0748d85baa7d74e8ac7849b0f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 26 Oct 2012 13:55:33 -0400 Subject: fixed Metadata unit tests --- src/lib/Bcfg2/Server/Plugins/Metadata.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index f6b05d451..83c4db3e0 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -208,8 +208,11 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): try: os.rename(tmpfile, fname) - - except: + except: # pylint: disable=W0702 + try: + os.unlink(tmpfile) + except: # pylint: disable=W0702 + pass msg = "Metadata: Failed to rename %s: %s" % (tmpfile, sys.exc_info()[1]) self.logger.error(msg) -- cgit v1.2.3-1-g7c22