[Collab-qa-commits] r1783 - udd/udd

[Lucas Nussbaum]

Author: lucas
Date: 2010-09-13 09:14:01 +0000 (Mon, 13 Sep 2010)
New Revision: 1783

Modified:
   udd/udd/upload_history_gatherer.py
Log:
upload history fixes

Modified: udd/udd/upload_history_gatherer.py
===================================================================
--- udd/udd/upload_history_gatherer.py	2010-09-13 09:12:41 UTC (rev 1782)
+++ udd/udd/upload_history_gatherer.py	2010-09-13 09:14:01 UTC (rev 1783)
@@ -50,9 +50,9 @@
     added = {}
     files = glob(path + '/debian-devel-changes.*')
     files.sort()
+    for name in files[-2:]:
 #    for name in files:
-    for name in files[-2:]:
-      bname = os.path.basename(name)
+      bname = os.path.basename(name).replace(".gz","").replace(".out","")
 #      print bname
       cursor.execute("DELETE FROM " + self.my_config['table'] + "_architecture where file='%s'" % (bname))
       cursor.execute("DELETE FROM " + self.my_config['table'] + "_closes where file='%s'" % (bname))
@@ -79,7 +79,11 @@
         if line == '':
           current['Changed-By_name'], current['Changed-By_email'] = email.Utils.parseaddr(current['Changed-By'])
           current['Maintainer_name'], current['Maintainer_email'] = email.Utils.parseaddr(current['Maintainer'])
-          current['Signed-By_name'], current['Signed-By_email'] = email.Utils.parseaddr(current['Signed-By'])
+          if current['Signed-By'].find('@') != -1:
+            current['Signed-By_name'], current['Signed-By_email'] = email.Utils.parseaddr(current['Signed-By'])
+          else:
+            current['Signed-By_name'] = current['Signed-By']
+            current['Signed-By_email'] = ''
           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 \