extras-buildsys/utils user-manager.py,1.2,1.3

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5519

Modified Files:
	user-manager.py 
Log Message:
Fix up some stuff in the user manager, allow listing of every user at the same time



Index: user-manager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- user-manager.py	2 Aug 2005 04:10:33 -0000	1.2
+++ user-manager.py	8 Aug 2005 16:15:18 -0000	1.3
@@ -60,13 +60,13 @@
 
     def dispatch(self, prog, command, args):
         if command == 'add':
-            um.add_user(args)
+            self.add_user(args)
         elif command == 'del':
-            um.del_user(args)
+            self.del_user(args)
         elif command == 'mod':
-            um.mod_user(args)
+            self.mod_user(args)
         elif command == 'find':
-            um.find_user(args)
+            self.find_user(args)
         else:
             print_usage(prog)
 
@@ -169,11 +169,12 @@
                     own_jobs, job_admin, user_admin, server_admin)
 
     def find_user(self, args):
-        if len(args) < 1:
-            raise UserManagerException("Invalid command, too few options.")
+        sql = "SELECT * FROM users"
 
-        email = args[0]
-        self.curs.execute('SELECT * FROM users WHERE email LIKE "%%%s%%"' % email)
+        if len(args) > 0:
+            sql = sql + ' WHERE email LIKE "%%%s%%"' % args[0]
+
+        self.curs.execute(sql)
         self.dbcx.commit()
         data = self.curs.fetchall()
         if not len(data):