summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gateway.scripts
diff options
context:
space:
mode:
authorBala.FA <bala@gluster.com>2011-09-22 14:02:06 +0530
committerTim <timothyasir@gluster.com>2011-09-23 13:58:02 +0530
commitc19042e99c20618bb72b8ae519124728550796fa (patch)
tree478a53996b9c6661edee1a5b07196f810ebf25b8 /src/com.gluster.storage.management.gateway.scripts
parenteff53560aeed0e1180188d7d51b78c9de7c77daf (diff)
Cleanup in gluster_cifs_volume_startup.py
Signed-off-by: Bala.FA <bala@gluster.com>
Diffstat (limited to 'src/com.gluster.storage.management.gateway.scripts')
-rw-r--r--src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
index cc4c394d..9ea7e021 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
@@ -79,15 +79,7 @@ def main():
Utils.runCommand("rm -fr %s/*" % Globals.CIFS_EXPORT_DIR, root=True, shell=True)
sys.exit(0)
- try:
- fp = open(Globals.VOLUME_SMBCONF_FILE)
- lines = fp.readlines()
- fp.close()
- except IOError, e:
- Utils.log("Failed to samba volume configuration file %s: %s" % (Globals.VOLUME_SMBCONF_FILE, str(e)))
- sys.stderr.write("Failed to samba volume configuration file %s: %s\n" % (Globals.VOLUME_SMBCONF_FILE, str(e)))
- sys.exit(1)
-
+ lines = Utils.readFile(Globals.VOLUME_SMBCONF_FILE)
volumeSmbConfList = [line.strip() for line in lines]
for volumeName in volumeInfo.keys():
if not "include = %s/%s.smbconf" % (Globals.VOLUME_CONF_DIR, volumeName) in volumeSmbConfList: