extras-buildsys/server BuildMaster.py, 1.37, 1.38 DBManager.py, 1.5, 1.6 UserInterface.py, 1.60, 1.61

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	BuildMaster.py DBManager.py UserInterface.py 
Log Message:
2006-03-12  Dan Williams  <dcbw at redhat.com>

    * server/BuildMaster.py
      server/DBManager.py
      server/UserInterface.py
        - Prefix 'epoch', 'version', and 'release' database fields with
            'rpm_', since MySQL 5 added 'release' as a reserved word.  Bastards.




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- BuildMaster.py	29 Nov 2005 06:41:51 -0000	1.37
+++ BuildMaster.py	12 Mar 2006 13:43:40 -0000	1.38
@@ -239,7 +239,7 @@
     def _write_job_status_to_db(self, uid, attrdict):
         sql = "status='%s'" % attrdict['status']
         if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'):
-            sql = sql + ", epoch='%s', version='%s', release='%s'" % (attrdict['epoch'],
+            sql = sql + ", rpm_epoch='%s', rpm_version='%s', rpm_release='%s'" % (attrdict['epoch'],
                     attrdict['version'], attrdict['release'])
         if attrdict.has_key('result_msg'):
             import urllib


Index: DBManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DBManager.py	25 Nov 2005 22:10:18 -0000	1.5
+++ DBManager.py	12 Mar 2006 13:43:40 -0000	1.6
@@ -312,8 +312,11 @@
         dbcx = self.dbcx()
         if not dbcx:
             os._exit(1)
-        self._ensure_tables(dbcx)
+        (success, msg) = self._ensure_tables(dbcx)
         del dbcx
+        if not success:
+            print msg
+            os._exit(1)
 
     def dbcx(self):
         try:
@@ -321,7 +324,6 @@
         except StandardError, e:
             dbcx = None
             print "DB Error: %s" % e
-
         return dbcx
 
     def _ensure_tables(self, dbcx):
@@ -348,16 +350,15 @@
                     'endtime BIGINT, '              \
                     'status VARCHAR(20), '          \
                     'result VARCHAR(15), '          \
-                    'epoch VARCHAR(4), '            \
-                    'version VARCHAR(25), '         \
-                    'release VARCHAR(25), '         \
+                    'rpm_epoch VARCHAR(4), '        \
+                    'rpm_version VARCHAR(25), '     \
+                    'rpm_release VARCHAR(25), '     \
                     'archlist VARCHAR(75), '        \
                     'result_msg TEXT'               \
                     ')' % uid_type)
                 dbcx.commit()
             except StandardError, e:
-                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
+                return (False, "Could not access the job database.  Reason: '%s'.  Exiting..." % e)
 
         # Create the archjobs table
         try:
@@ -378,8 +379,7 @@
                     ')')
                 dbcx.commit()
             except StandardError, e:
-                print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
+                return (False, "Could not access the job database.  Reason: '%s'.  Exiting..." % e)
 
         # Create the users table
         try:
@@ -397,6 +397,8 @@
                     ')')
                 dbcx.commit()
             except StandardError, e:
-                print "Could not access the user database.  Reason: '%s'.  Exiting..." % e
-                os._exit(1)
+                return (False, "Could not access the user database.  Reason: '%s'.  Exiting..." % e)
+
+        return (True, "")
+
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- UserInterface.py	28 Nov 2005 17:51:05 -0000	1.60
+++ UserInterface.py	12 Mar 2006 13:43:40 -0000	1.61
@@ -376,7 +376,7 @@
             return (-1, "Error: Invalid job UID.", {})
 
         sql = 'SELECT uid, username, package, source, target_distro, target_target, ' \
-                'target_repo, starttime, endtime, status, epoch, version, release,  ' \
+                'target_repo, starttime, endtime, status, rpm_epoch, rpm_version, rpm_release,  ' \
                 'archlist, result_msg FROM jobs WHERE uid=%d' % uid
 
         # Run the query for the job
@@ -402,10 +402,10 @@
         jobrec['starttime'] = job['starttime']
         jobrec['endtime'] = job['endtime']
         jobrec['status'] = job['status']
-        if job['epoch'] and job['version'] and job['release']:
-            jobrec['epoch'] = job['epoch']
-            jobrec['version'] = job['version']
-            jobrec['release'] = job['release']
+        if job['rpm_epoch'] and job['rpm_version'] and job['rpm_release']:
+            jobrec['epoch'] = job['rpm_epoch']
+            jobrec['version'] = job['rpm_version']
+            jobrec['release'] = job['rpm_release']
             base_url = self._cfg.get_str("UI", "log_url")
             target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo'])
             log_url = PackageJob.make_job_log_url(base_url, target_str,