summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-26 13:55:33 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-26 13:55:33 -0400
commitb18ccc2952ebdbb0748d85baa7d74e8ac7849b0f (patch)
treeff452b7516b778d6c9e716059bcb1ab21adf010c /src
parent39246ecc1f9ad211a0bcbcb567bef763d8e0c3c5 (diff)
downloadbcfg2-b18ccc2952ebdbb0748d85baa7d74e8ac7849b0f.tar.gz
bcfg2-b18ccc2952ebdbb0748d85baa7d74e8ac7849b0f.tar.bz2
bcfg2-b18ccc2952ebdbb0748d85baa7d74e8ac7849b0f.zip
fixed Metadata unit tests
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Metadata.py7
1 files changed, 5 insertions, 2 deletions
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)