[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

extras-buildsys/server BuildJob.py, 1.4, 1.5 CONFIG.py, 1.10, 1.11 UserInterface.py, 1.5, 1.6 buildserver.py, 1.7, 1.8



Author: dcbw

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

Modified Files:
	BuildJob.py CONFIG.py UserInterface.py buildserver.py 
Log Message:
2005-06-16  Dan Williams <dcbw redhat com>

	* common/SSLCommon.py
		- Override SSL.SSLServer's handle_error() method since it doesn't
			take the right number of arguments

	* common/SimpleSSLXMLRPCServer.py
		- Add proxy lcl_resolve_dotted_attribute() function to deal with
			different versions of python

	* server/BuildJob.py
		- email_to -> self.username in email_result()

	* server/UserInterface.py
		- email_to -> email in email_result()
		- Fix typo that broke simple SRPM building (cvs_tag -> srpm_file)

	* server/buildserver.py
		- Deal with m2crypto 0.09 X509 cert handling of 'emailAddress'/'Email'

	* utils/package-builder.py
		- Deal with m2crypto 0.09 X509 cert handling of 'emailAddress'/'Email'
		- Fix simple SRPM building, our local enqueue_srpm() function was calling
			just enqueue() on the server




Index: BuildJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildJob.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BuildJob.py	15 Jun 2005 04:49:08 -0000	1.4
+++ BuildJob.py	17 Jun 2005 03:10:29 -0000	1.5
@@ -463,7 +463,7 @@
         msg['To'] = self.username
         s = smtplib.SMTP()
         s.connect()
-        s.sendmail(CONFIG.get('email_from'), [email_to], msg.as_string())
+        s.sendmail(CONFIG.get('email_from'), [self.username], msg.as_string())
         s.close()
 
     def _createrepo(self):


Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CONFIG.py	15 Jun 2005 04:49:08 -0000	1.10
+++ CONFIG.py	17 Jun 2005 03:10:29 -0000	1.11
@@ -19,7 +19,7 @@
 config_opts['ssl_buildclients'] = True
 
 
-SERVER_BASE_DIR = "/work/fedora-cvs/extras-buildsys/server"
+SERVER_BASE_DIR = "/work/extras-buildsys/server"
 
 # SSL Cert and key bits
 # MUST be full path to cert
@@ -45,7 +45,7 @@
 # This option disables pulling from CVS.  Allowing jobs to be submitted
 # as unknown SRPMs from random people may be a security risk, so don't
 # do this unless you really really want to.
-config_opts['use_srpm_not_cvs'] = False
+config_opts['use_srpm_not_cvs'] = True
 
 # Targets
 #
@@ -56,18 +56,14 @@
 # Further architectures on a per-package basis are configured in each target's
 # package file.  See the config option 'addl_package_arches_dir'.
 #
-config_opts['targets'] = {  'FC-3' :	['i386', 'x86_64'],
-                            'devel' :	['i386']
-                         }
+config_opts['targets'] = {  'devel' :	['sparc'] }
 
 # Target Optional Arches
 #
 # These are arches that submitters _may_ build packages on, but packages won't
 # be built on these arches by default.
 #
-config_opts['target_optional_arches'] = {   'FC-3' :	[],
-                                            'devel' :	[]
-                                        }
+config_opts['target_optional_arches'] = {   'devel' :	['sparc64'] }
 
 
 # Additional Package Arches files
@@ -92,7 +88,9 @@
 
 
 # Builder Clients
-config_opts['builders'] = [ 'https://127.0.0.1:8888' ]
+config_opts['builders'] = [ 'https://flare.boston.redhat.com:8888',
+			    'https://172.16.83.108:8888'
+			  ]
 
 
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserInterface.py	16 Jun 2005 21:19:30 -0000	1.5
+++ UserInterface.py	17 Jun 2005 03:10:29 -0000	1.6
@@ -36,7 +36,7 @@
     msg['To'] = email
     s = smtplib.SMTP()
     s.connect()
-    s.sendmail(CONFIG.get('email_from'), [email_to], msg.as_string())
+    s.sendmail(CONFIG.get('email_from'), [email], msg.as_string())
     s.close()
 
 
@@ -178,7 +178,7 @@
     def enqueue_srpm(self, user, package, srpm_file, target, buildreq=None):
         if not user.own_jobs:
             return (-1, "Insufficient privileges.")
-        return UserInterface.enqueue_srpm(self, user.email, package, cvs_tag, target, buildreq)
+        return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq)
 
 
     def list_jobs(self, user, args_dict):


Index: buildserver.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/buildserver.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildserver.py	15 Jun 2005 04:10:08 -0000	1.7
+++ buildserver.py	17 Jun 2005 03:10:29 -0000	1.8
@@ -43,7 +43,14 @@
         TODO: pull user privs from a DB
         """
         peer_cert = request.get_peer_cert()
-        email = peer_cert.get_subject().emailAddress
+
+        # m2crypto 0.9 only supports 'Email' so fall through
+        # to that if emailAddress doesn't work
+        try:
+            email = peer_cert.get_subject().emailAddress
+        except AttributeError:
+            email = peer_cert.get_subject().Email
+
         user = None
         try:
             user = self.authenticator.new_authed_user(email, client_address)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]