[Collab-qa-commits] r1547 - udd/udd
Lucas Nussbaum
lucas at alioth.debian.org
Thu Jul 30 00:15:28 UTC 2009
Author: lucas
Date: 2009-07-30 00:15:28 +0000 (Thu, 30 Jul 2009)
New Revision: 1547
Modified:
udd/udd/dehs_gatherer.py
udd/udd/ldap_gatherer.py
Log:
minor fixes to ldap and dehs gatherer
Modified: udd/udd/dehs_gatherer.py
===================================================================
--- udd/udd/dehs_gatherer.py 2009-07-30 00:14:49 UTC (rev 1546)
+++ udd/udd/dehs_gatherer.py 2009-07-30 00:15:28 UTC (rev 1547)
@@ -40,21 +40,25 @@
cur.execute("""PREPARE dehs_insert
AS INSERT INTO dehs
- (source, unstable_version, unstable_upstream, unstable_parsed_version, unstable_status,
- experimental_version, experimental_upstream, experimental_parsed_version, experimental_status)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)""")
+ (source, unstable_version, unstable_upstream, unstable_parsed_version, unstable_status, unstable_last_uptodate,
+ experimental_version, experimental_upstream, experimental_parsed_version, experimental_status, experimental_last_uptodate)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)""")
line_number = 0
entries = []
for line in file(my_config['path']):
line_number += 1
- src, uu, eu, uv, ev, upv, epv, u_utd, e_utd, uf, ef = line.rstrip().split('|')
+ src, uu, eu, uv, ev, upv, epv, u_utd, e_utd, uf, ef, udate, edate = line.rstrip().split('|')
+ if udate == "":
+ udate = None
+ if edate == "":
+ edate = None
ustat = 'error' if uf == 't' else ('uptodate' if u_utd == 't' else ('outdated' if u_utd == 'f' else None))
estat = 'error' if ef == 't' else ('uptodate' if e_utd == 't' else ('outdated' if e_utd == 'f' else None))
- entries.append((src, uv, uu, upv, ustat, ev, eu, epv, estat))
+ entries.append((src, uv, uu, upv, ustat, udate, ev, eu, epv, estat, edate))
- cur.executemany("EXECUTE dehs_insert (%s, %s, %s, %s, %s, %s, %s, %s, %s)", entries)
+ cur.executemany("EXECUTE dehs_insert (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", entries)
cur.execute("DEALLOCATE dehs_insert")
cur.execute("ANALYZE dehs")
Modified: udd/udd/ldap_gatherer.py
===================================================================
--- udd/udd/ldap_gatherer.py 2009-07-30 00:14:49 UTC (rev 1546)
+++ udd/udd/ldap_gatherer.py 2009-07-30 00:15:28 UTC (rev 1547)
@@ -27,7 +27,7 @@
cur.execute("""PREPARE ldap_insert
AS INSERT INTO ldap
- (uid, login, cn, sn, expire, location, country, activity_from, activity_from_info, activity_gpg, activity_gpg_info, gecos, birthdate, gender)
+ (uid, login, cn, sn, expire, location, country, activity_from, activity_from_info, activity_pgp, activity_pgp_info, gecos, birthdate, gender)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)""")
entries = []
@@ -40,8 +40,8 @@
else:
af_date = None
af_info = None
- if 'activity-gpg' in f:
- ag_date, ag_info = f['activity-gpg'][0].split('] ',2)
+ if 'activity-pgp' in f:
+ ag_date, ag_info = f['activity-pgp'][0].split('] ',2)
ag_date = ag_date[1:]
else:
ag_date = None
More information about the Collab-qa-commits
mailing list