From d8ecfa859e3377f448fa970031d5204e42f15c96 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 16 Aug 2011 18:46:31 +0530 Subject: Fixed typo. Variable name changed from username to userName. --- .../src/backend/add_user_cifs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/com.gluster.storage.management.gateway.scripts') diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py index b2bf045a..2e1a1574 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py @@ -37,8 +37,8 @@ def main(): sys.exit(1) except KeyError, e: if Utils.runCommand("groupadd -g %s %s" % (uid, userName)) != 0: - Utils.log("failed to add group %s gid %s\n" % (username, uid)) - sys.stderr.write("Failed to add group %s gid %s\n" % (username, uid)) + Utils.log("failed to add group %s gid %s\n" % (userName, uid)) + sys.stderr.write("Failed to add group %s gid %s\n" % (userName, uid)) sys.exit(2) try: userInfo = pwd.getpwnam(userName) -- cgit From b1024dd6b80b5a4ad4efa98ff3864729a09c01ba Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 16 Aug 2011 18:56:33 +0530 Subject: Bug 3397 - GUI does not proceed beyond cluster register on AMI. --- .../src/backend/get_server_details.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/com.gluster.storage.management.gateway.scripts') diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py index 30ffac58..ecbe1237 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py @@ -24,6 +24,7 @@ if not p1 in sys.path: sys.path.append(p1) if not p2 in sys.path: sys.path.append(p2) +import dbus import socket import re import Utils @@ -100,11 +101,16 @@ def getServerDetails(listall): responseDom.appendTag(serverTag) serverTag.appendChild(responseDom.createTag("numOfCPUs", int(os.sysconf('SC_NPROCESSORS_ONLN')))) - diskDom = DiskUtils.getDiskDom() + try: + diskDom = DiskUtils.getDiskDom() + except dbus.dbus_bindings.DBusException, e: + sys.stderr.write("Failed to connect HAL to get device details. Please check if HAL services are running\n") + Utils.log("Failed to connect HAL to get device details") + sys.exit(1) if not diskDom: sys.stderr.write("No disk found!") Utils.log("Failed to get disk details") - sys.exit(1) + sys.exit(2) serverTag.appendChild(diskDom.getElementsByTagRoute("disks")[0]) return serverTag -- cgit