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

[Lucas Nussbaum]

Author: lucas
Date: 2009-10-07 20:47:31 +0000 (Wed, 07 Oct 2009)
New Revision: 1599

Modified:
   udd/sql/setup.sql
   udd/sql/upgrade.sql
   udd/udd/sources_gatherer.py
Log:
turn DM-upload-allowed into boolean

Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2009-10-07 19:55:23 UTC (rev 1598)
+++ udd/sql/setup.sql	2009-10-07 20:47:31 UTC (rev 1599)
@@ -9,7 +9,7 @@
     text, distribution text, release release, component text, vcs_type text,
     vcs_url text, vcs_browser text,
     python_version text, checksums_sha1 text, checksums_sha256 text,
-    original_maintainer text, dm_upload_allowed text,
+    original_maintainer text, dm_upload_allowed boolean,
     PRIMARY KEY (source, version, distribution, release, component));
 
 GRANT SELECT ON sources TO PUBLIC;
@@ -64,7 +64,7 @@
     text, distribution text, release release, component text, vcs_type text,
     vcs_url text, vcs_browser text,
     python_version text, checksums_sha1 text, checksums_sha256 text,
-    original_maintainer text, dm_upload_allowed text,
+    original_maintainer text, dm_upload_allowed boolean,
     PRIMARY KEY (source, version, distribution, release, component));
 
 CREATE INDEX ubuntu_sources_distrelcomp_idx on ubuntu_sources(distribution, release, component);

Modified: udd/sql/upgrade.sql
===================================================================
--- udd/sql/upgrade.sql	2009-10-07 19:55:23 UTC (rev 1598)
+++ udd/sql/upgrade.sql	2009-10-07 20:47:31 UTC (rev 1599)
@@ -254,3 +254,9 @@
 
 ALTER TABLE dehs ADD unstable_last_uptodate timestamp;
 ALTER TABLE dehs ADD experimental_last_uptodate timestamp;
+
+-- 2009-10-07
+ALTER TABLE sources DROP dm_upload_allowed;
+ALTER TABLE sources ADD dm_upload_allowed boolean;
+ALTER TABLE ubuntu_sources DROP dm_upload_allowed;
+ALTER TABLE ubuntu_sources ADD dm_upload_allowed boolean;

Modified: udd/udd/sources_gatherer.py
===================================================================
--- udd/udd/sources_gatherer.py	2009-10-07 19:55:23 UTC (rev 1598)
+++ udd/udd/sources_gatherer.py	2009-10-07 20:47:31 UTC (rev 1599)
@@ -75,6 +75,9 @@
         d['Vcs-Browser'] = control["Vcs-Browse"]
     else:
         d['Vcs-Browser'] = None
+    if control.has_key("Dm-Upload-Allowed"):
+        d['Dm-Upload-Allowed'] = (d['Dm-Upload-Allowed'].lower() == 'yes')
+
     
     for k in control.keys():
       if k not in sources_gatherer.mandatory and k not in sources_gatherer.non_mandatory and k not in sources_gatherer.ignorable: