extras-buildsys/server UserInterface.py,1.44,1.44.2.1

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
      Tag: STABLE_0_3
	UserInterface.py 
Log Message:
2005-08-15  Dan Williams <dcbw at redhat.com>

    * server/UserInterface.py
        - (UserInterface::enqueue, UserInterface::enqueue_srpm,
            UserInterfaceSSLAuth::enqueue, UserInterface::enqueue_srpm):
            - We need to return 3 arguments on errors, not just 2




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -r1.44 -r1.44.2.1
--- UserInterface.py	8 Aug 2005 02:54:16 -0000	1.44
+++ UserInterface.py	15 Aug 2005 14:15:24 -0000	1.44.2.1
@@ -135,24 +135,24 @@
         if config_opts['use_srpm_not_cvs'] == True:
             email_result(email, cvs_tag, "Error setting up build for %s on "\
                     "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target))
-            return (-1, "This build server is set up for building SRPMS only.  Use the 'enqueue_srpm' command instead.")
+            return (-1, "This build server is set up for building SRPMS only.  Use the 'enqueue_srpm' command instead.", -1)
 
         if not validate_package_name(package):
             email_result(email, cvs_tag, "Error setting up build for %s on "\
                     "%s: Package name '%s' contained an illegal character.  Submit a bug report?" % (cvs_tag, target, package))
-            return (-1, "The package name contained an illegal character.")
+            return (-1, "The package name contained an illegal character.", -1)
 
         if not validate_cvs_tag(cvs_tag):
             email_result(email, cvs_tag, "Error setting up build for %s on "\
                     "%s: The CVS tag '%s' contained an illegal character.  Submit a bug report?" % (package, target, cvs_tag))
-            return (-1, "The CVS tag contained an illegal character.")
+            return (-1, "The CVS tag contained an illegal character.", -1)
 
         try:
             real_target = resolve_target(target)
         except InvalidTargetError:
             email_result(email, cvs_tag, "Error setting up build for %s on "\
                     "%s: target does not exist." % (cvs_tag, target))
-            return (-1, "This build server does not support the target %s." % target)
+            return (-1, "This build server does not support the target %s." % target, -1)
         else:
             print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email)
             req = self._bm.create_job_request(email, package, cvs_tag, real_target, buildreq, time.time())
@@ -166,31 +166,31 @@
         if config_opts['use_srpm_not_cvs'] == False:
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target))
-            return (-1, "This build server is set up for building from CVS.  Use the 'enqueue' command instead.")
+            return (-1, "This build server is set up for building from CVS.  Use the 'enqueue' command instead.", -1)
 
         if not validate_package_name(package):
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: Package name '%s' contained an illegal character.  Submit a bug report?" % (package, target, package))
-            return (-1, "The package name contained an illegal character.")
+            return (-1, "The package name contained an illegal character.", -1)
 
         # We limit the database field to 255 chars
         if len(srpm_file) > 255:
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target))
-            return (-1, "Pathname to SRPM is limited to 255 characters.")
+            return (-1, "Pathname to SRPM is limited to 255 characters.", -1)
 
         srpm_file = os.path.abspath(srpm_file)
         if not srpm_file or not os.access(srpm_file, os.R_OK):
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: The SRPM does not exist, or is not accessible.  Remember to use absolute paths." % (srpm_file, target))
-            return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.")
+            return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.", -1)
 
         try:
             real_target = resolve_target(target)
         except InvalidTargetError:
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: target does not exist." % (srpm_file, target))
-            return (-1, "This build server does not support the target %s." % target)
+            return (-1, "This build server does not support the target %s." % target, -1)
         else:
             print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email)
             req = self._bm.create_job_request(email, package, srpm_file, real_target, buildreq, time.time())
@@ -515,16 +515,17 @@
     def enqueue(self, package, cvs_tag, target, buildreq=None):
         user = AuthedXMLRPCServer.get_authinfo()
         if not user or not user.own_jobs:
-            return (-1, "Insufficient privileges.")
+            return (-1, "Insufficient privileges.", -1)
         return UserInterface.enqueue(self, user.email, package, cvs_tag, target, buildreq)
 
 
     def enqueue_srpm(self, package, srpm_file, target, buildreq=None):
         user = AuthedXMLRPCServer.get_authinfo()
         if not user or not user.own_jobs:
-            return (-1, "Insufficient privileges.")
+            return (-1, "Insufficient privileges.", -1)
         return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq)
 
+
     def requeue(self, uid):
         user = AuthedXMLRPCServer.get_authinfo()
         if not user or not user.own_jobs:
@@ -552,6 +553,7 @@
             
         return UserInterface.requeue(self, uid)
 
+
     def kill_job(self, email, jobid):
         user = AuthedXMLRPCServer.get_authinfo()
         if not user or not user.own_jobs: