Changeset 438

Timestamp:

05/07/08 09:54:40 (8 months ago)

Author:

mgoldman

Message:

Merged changes to manager.py into the new style argument handling.

Files:

• branches/trunk-pmd-intproto/mgmt/manager.py (modified) (2 diffs)

branches/trunk-pmd-intproto/mgmt/manager.py

@@ -131 +131 @@
-### returns the response from the server.
-def handlestorage(mgr, cmd, argv):
-FILE GROUP
+GROUP FILE
-        if(len(argv) < 2):
-                print useage
-                sys.exit(1)
+        resp = m.query_server(m.list_groups())
+        if argv[0] not in resp.body:
+                print 'Group \'' + argv[0] + '\' does not exist'
+                sys.exit(1)
-        if cmd == 'add':
-
-
-
+
+
+
+
+
+
+
+
+
+
-        elif cmd == 'remove':
-
-
+
+
+
+
+
+
+
+
-
-def handleupdate(mgr, argv):
@@ -216 +233 @@
-        if cmd == 'add' or cmd == 'remove':
-                res = handlestorage(m, cmd, sys.argv[2:])
-        #if cmd == 'add':
-        #       if arg1 == '' or arg2 == '':
-        #               print 'usage:'
-        #               print '   add GROUP FILE...'
-        #               sys.exit(1)
-        #       resp = m.query_server(m.list_groups())
-        #       if arg1 not in resp.body:
-        #               print 'Group \'' + arg1 + '\' does not exist'
-        #               sys.exit(1)
-        #       files = []
-        #       for arg in sys.argv[3:]:
-        #               if not os.path.exists(arg):
-        #                       print 'File \'' + arg + '\' does not exist'
-        #               else:
-        #                       files.append((os.path.realpath(os.path.expanduser(arg))), file_util.checksum(arg))
-        #       if len(files) != len(sys.argv[3:]):
-        #               sys.exit(1)
-        #       msg = m.add_message(arg1)
-        #       msg.body[1] += files
-        #elif cmd == 'remove':
-        #       if arg1 == '' or arg2 == '':
-        #               print 'usage:'
-        #               print '   remove GROUP FILE...'
-        #               sys.exit(1)
-        #       resp = m.query_server(m.list_groups())
-        #       if arg1 not in resp.body:
-        #               print 'Group \'' + arg1 + '\' does not exist'
-        #               sys.exit(1)
-        #       files = [os.path.basename(x) for x in sys.argv[3:]]
-        #       msg = m.remove_message(arg1)
-        #       msg.body[1] += files
-        elif cmd == 'update':
-                res = handleupdate(m, sys.argv[2:])