extras-buildsys/client client.py,1.23,1.24

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	client.py 
Log Message:
2005-08-05  Dan Williams <dcbw at redhat.com>

    * builder/builder.py
        - (_mock_done): hand-wavy attempt to ensure the mock child process
            is always reaped

    * client/client.py
        - (enqueue, enqueue_srpm): Print out returned job UID
        - (detail_job): remove bogus email argument

    * server/BuildMaster.py
        - (create_job_request): new function to consolidate job request creation
        - (enqueue, enqueue_srpm): consolidate to one enqueue() function since
            the database really makes no distinction between CVS and SRPM jobs
        - (_start_new_jobs): return UID to requester when we become aware of it

    * server/UserInterface.py
        - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster
            to return the new job's UID
        - (enqueue, enqueue_srpm): use create_job_request(), and wait for the
            job's UID to be returned from the BuildMaster, which we then pass
            back to the client
        - (detail_job): remove bogus email argument
        - (_kill_job): warn user if the job is no longer building or waiting to
            be added to the repo.  We can't kill jobs if they are no longer building.

    * www/job.psp
        - detail_job()'s email argument got removed, remove it here to




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- client.py	4 Aug 2005 20:27:11 -0000	1.23
+++ client.py	5 Aug 2005 16:24:07 -0000	1.24
@@ -61,13 +61,17 @@
     target = args[2]
     use_ssl = config.get('Server', 'use_ssl')
     if use_ssl.lower() == 'true':
-        (e, msg,) = server.enqueue(package, tag, target)
+        (e, msg, uid) = server.enqueue(package, tag, target)
     else:
-        (e, msg) = server.enqueue(email, package, tag, target)
+        (e, msg, uid) = server.enqueue(email, package, tag, target)
     if e == -1:
         print "Server returned an error: %s" % msg
+        return
+
+    if uid != -1:
+        print "Package %s enqueued.  Job ID: %d." % (package, uid)
     else:
-        print "Package %s enqueued." % package
+        print "Package %s enqueued.  (However, no Job ID was provided in the time required)" % package
 
 
 def enqueue_srpm(server, email, args):
@@ -80,13 +84,17 @@
     target = args[2]
     use_ssl = config.get('Server', 'use_ssl')
     if use_ssl.lower() == 'true':
-        (e, msg) = server.enqueue_srpm(package, srpm, target)
+        (e, msg, uid) = server.enqueue_srpm(package, srpm, target)
     else:
-        (e, msg) = server.enqueue_srpm(email, package, srpm, target)
+        (e, msg, uid) = server.enqueue_srpm(email, package, srpm, target)
     if e == -1:
         print "Server returned an error: %s" % msg
+        return
+
+    if uid != -1:
+        print "Package %s enqueued.  Job ID: %d." % (package, uid)
     else:
-        print "Package %s enqueued." % package
+        print "Package %s enqueued.  (However, no Job ID was provided in the time required)" % package
 
 
 def requeue_job(server, email, uid):
@@ -154,12 +162,12 @@
             except IOError:
                 pass
 
-def detail_job(server, email, jobid):
+def detail_job(server, jobid):
     """
     Get a single job's details
     """
     try:
-        (err, msg, jobrec) = server.detail_job(email, jobid)
+        (err, msg, jobrec) = server.detail_job(jobid)
     except socket.error, e:
         print "Error connecting to build server: '%s'" % e
         return
@@ -369,7 +377,7 @@
     elif cmd == 'list':
         list_jobs(server, sys.argv[2:])
     elif cmd == 'detail':
-        detail_job(server, email, sys.argv[2])
+        detail_job(server, sys.argv[2])
     elif cmd == 'kill':
         if len(sys.argv) < 3:
             print "Error: need a job UID to kill"