summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShireesh Anjal <anjalshireesh@gmail.com>2011-08-23 05:33:19 -0700
committerShireesh Anjal <anjalshireesh@gmail.com>2011-08-23 05:33:19 -0700
commit708eb3ae7ae29bb3f834af3fa699e4c4c36e08c5 (patch)
tree1b03a2ce4069686f1ae2884214de23057070cec8
parentf5efa7b85666376252a4990e2044f691c52197ca (diff)
parent024c8f2cc9298ccfcb3faf50b52da1724eb5f475 (diff)
Merge pull request #272 from TimothyAsir/master
Fixed file did not closed error and logged the IOError.
-rwxr-xr-xsrc/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py b/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
index 55230113..e90b6a57 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
@@ -55,9 +55,10 @@ def main():
try:
fp = open(tempFileName, "w")
fp.write("%s\n" % serverName)
- except IOError:
- Utils.log("Failed to write server name to file %s" % tempFileName)
- sys.stderr.write("Failed to write server name to file\n")
+ fp.close()
+ except IOError, e:
+ Utils.log("Failed to write server name to file %s: %s" % (tempFileName, str(e)))
+ sys.stderr.write("Failed to write server name to file %s: %s\n" % (tempFileName, str(e)))
sys.exit(3)
status = True
@@ -70,8 +71,8 @@ def main():
try:
os.remove(tempFileName)
except OSError, e:
- Utils.log("Failed to remove temporary file %s" % tempFileName)
- sys.stderr.write("Failed to remove temporary file %s\n" % tempFileName)
+ Utils.log("Failed to remove temporary file %s: %s" % (tempFileName, str(e)))
+ sys.stderr.write("Failed to remove temporary file %s: %s\n" % (tempFileName, str(e)))
pass
if status: