1 files changed, 6 insertions, 12 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py b/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
index 3c68891c..a86e7264 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
@@ -16,18 +16,12 @@ import Utils
 
 
 def removeUser(userName):
-    try:
-        fp = open(Globals.CIFS_USER_FILE)
-        content = fp.read()
-        fp.close()
-    except IOError, e:
-        Utils.log("failed to read file %s: %s" % (Globals.CIFS_USER_FILE, str(e)))
-        return False
-
+    lines = Utils.readFile(Globals.CIFS_USER_FILE, lines=True)
     try:
         fp = open(Globals.CIFS_USER_FILE, "w")
-        lines = content.strip().split()
         for line in lines:
+            if not line.strip():
+                continue
             if line.split(":")[1] == userName:
                 continue
             fp.write("%s\n" % line)
@@ -40,13 +34,13 @@ def removeUser(userName):
 
 def main():
     if len(sys.argv) < 3:
-        sys.stderr.write("usage: %s SERVER_LIST USERNAME\n" % os.path.basename(sys.argv[0]))
+        sys.stderr.write("usage: %s SERVER_FILE USERNAME\n" % os.path.basename(sys.argv[0]))
         sys.exit(-1)
 
-    serverList = sys.argv[1]
+    serverFile = sys.argv[1]
     userName = sys.argv[2]
 
-    rv = Utils.runCommand("grun.py %s delete_user_cifs.py %s" % (serverList, userName))
+    rv = Utils.grun(serverFile, "delete_user_cifs.py", [userName])
     if rv == 0:
         if not removeUser(userName):
             Utils.log("Failed to remove the user:%s on gateway server\n" % userName)