extras-buildsys/client client.py,1.28,1.29

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * Make more stuff actually work




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- client.py	24 Aug 2005 19:27:54 -0000	1.28
+++ client.py	29 Aug 2005 17:48:19 -0000	1.29
@@ -146,27 +146,21 @@
             raise CommandException("Invalid command.  The 'build' command takes 3 arguments.")
         package = args[0]
         source = args[1]
-        target = args[2]
+        target_alias = args[2]
         is_srpm = False
         if source.endswith(".src.rpm"):
             if not os.path.exists(source):
                 raise CommandException("The SRPM %s does not exist." % source)
-            is_srpm = True
-        self._enqueue(is_srpm, package, source, target)
+        self._enqueue(package, source, target_alias)
 
-    def _enqueue(self, is_srpm, package, source, target):
+    def _enqueue(self, package, source, target_alias):
         """ Enqueue a package on the server by CVS tag """
+
         use_ssl = self._cfg.get_bool("Server", "use_ssl")
-        if is_srpm:
-            if use_ssl:
-                (e, msg, jobid) = self._server.enqueue_srpm(package, source, target)
-            else:
-                (e, msg, jobid) = self._server.enqueue_srpm(self._email, package, source, target)
+        if use_ssl:
+            (e, msg, jobid) = self._server.enqueue(package, source, target_alias)
         else:
-            if use_ssl:
-                (e, msg, jobid) = self._server.enqueue(package, source, target)
-            else:
-                (e, msg, jobid) = self._server.enqueue(self._email, package, source, target)
+            (e, msg, jobid) = self._server.enqueue(self._email, package, source, target_alias)
 
         if e == -1:
             print "Server returned an error: %s" % msg
@@ -273,7 +267,7 @@
         print "\nBuilders:"
         print "-" * 90
         for builder in builder_list:
-            builder_addr = builder['address'] + ":" + builder['port']
+            builder_addr = builder['address']
             string = "  " + builder_addr
             string = string + " " * (40 - len(builder_addr))
             for arch in builder['arches']: