[Collab-qa-commits] r2058 - in udd: sql udd

[Iain Lane]

Author: laney
Date: 2011-10-25 18:41:32 +0000 (Tue, 25 Oct 2011)
New Revision: 2058

Modified:
   udd/sql/setup.sql
   udd/udd/upload_history_gatherer.py
Log:
Add 'component' column to ubuntu_upload_history & handle input w/o Message-Date



Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2011-10-25 13:23:45 UTC (rev 2057)
+++ udd/sql/setup.sql	2011-10-25 18:41:32 UTC (rev 2058)
@@ -481,7 +481,7 @@
 
 CREATE TABLE ubuntu_upload_history
  (source text, version debversion, date timestamp with time zone,
- changed_by text, changed_by_name text, changed_by_email text, maintainer text, maintainer_name text, maintainer_email text, nmu boolean, signed_by text, signed_by_name text, signed_by_email text, key_id text, distribution text, file text, 
+ changed_by text, changed_by_name text, changed_by_email text, maintainer text, maintainer_name text, maintainer_email text, nmu boolean, signed_by text, signed_by_name text, signed_by_email text, key_id text, distribution text, component text, file text, 
  fingerprint text, original_maintainer text, original_maintainer_name text, original_maintainer_email text,
  PRIMARY KEY (source, version));
 CREATE TABLE ubuntu_upload_history_launchpad_closes

Modified: udd/udd/upload_history_gatherer.py
===================================================================
--- udd/udd/upload_history_gatherer.py	2011-10-25 13:23:45 UTC (rev 2057)
+++ udd/udd/upload_history_gatherer.py	2011-10-25 18:41:32 UTC (rev 2058)
@@ -33,7 +33,7 @@
     tables = ['source', 'version', 'date', 'changed_by', 'changed_by_name', 'changed_by_email', 'maintainer', 'maintainer_name', 'maintainer_email', 'nmu', 'signed_by', 'signed_by_name', 'signed_by_email', 'key_id', 'fingerprint', 'distribution', 'file']
 
     if self.is_ubuntu:
-      tables = tables + ['original_maintainer', 'original_maintainer_name', 'original_maintainer_email']
+      tables = tables + ['original_maintainer', 'original_maintainer_name', 'original_maintainer_email', 'component']
 
     indices = ', '.join(map(lambda x: '$' + str(x), range(1,len(tables)+1)))
     tables = ', '.join(tables)
@@ -60,7 +60,7 @@
       %(Fingerprint)s, %(Distribution)s, %(File)s)"
 
     if self.is_ubuntu:
-        query = query[:-1] + ", %(Original-Maintainer)s, %(Original-Maintainer_name)s, %(Original-Maintainer_email)s)"
+        query = query[:-1] + ", %(Original-Maintainer)s, %(Original-Maintainer_name)s, %(Original-Maintainer_email)s, %(Component)s)"
         
     if self.is_debian:
         query_archs = "EXECUTE uh_arch_insert(%(Source)s, %(Version)s, %(arch)s, %(File)s)"
@@ -127,7 +127,8 @@
               current['Original-Maintainer_name'], current['Original-Maintainer_email'] = aux.parse_email(current['Original-Maintainer'])
             else:
               current['Original-Maintainer_name'] = current['Original-Maintainer_email'] = 'N/A'
-            
+          if not current.has_key('Message-Date') and current.has_key('Date'):
+            current['Message-Date'] = current['Date']
           current['Message-Date'] = current['Message-Date'].partition('(')[0].replace('+4200','+0000').replace('+4300','+0000').replace('+4100','+0000').replace('+4400','+0000').replace('+4000','+0000')
           if (current['Source'], current['Version']) in added or \
             (current['Source'], current['Version']) == ('libapache-authznetldap-perl', '0.07-4') or \