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

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-12-19 13:30:53 +0000 (Fri, 19 Dec 2008)
New Revision: 1353

Modified:
   udd/sql/setup.sql
   udd/sql/upgrade.sql
   udd/udd/packages_gatherer.py
   udd/udd/sources_gatherer.py
Log:
add support for breaks, ignore some non-relevant fields

Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2008-12-19 13:30:35 UTC (rev 1352)
+++ udd/sql/setup.sql	2008-12-19 13:30:53 UTC (rev 1353)
@@ -30,7 +30,7 @@
 CREATE TABLE packages
   (package text, version text, architecture text, maintainer text, description
     text, source text, source_version text, essential text, depends text,
-    recommends text, suggests text, enhances text, pre_depends text,
+    recommends text, suggests text, enhances text, pre_depends text, breaks text,
     installed_size int, homepage text, size int,
     build_essential text, origin text, sha1 text, replaces text, section text,
     md5sum text, bugs text, priority text, tag text, task text, python_version text,

Modified: udd/sql/upgrade.sql
===================================================================
--- udd/sql/upgrade.sql	2008-12-19 13:30:35 UTC (rev 1352)
+++ udd/sql/upgrade.sql	2008-12-19 13:30:53 UTC (rev 1353)
@@ -23,3 +23,5 @@
 ALTER TABLE ubuntu_sources add maintainer_email text;
 -- 2008-10-05: add fingerprint column in upload_history
 ALTER TABLE upload_history add fingerprint text;
+-- 2008-12-19: add breaks column in packages
+ALTER TABLE packages add breaks text;

Modified: udd/udd/packages_gatherer.py
===================================================================
--- udd/udd/packages_gatherer.py	2008-12-19 13:30:35 UTC (rev 1352)
+++ udd/udd/packages_gatherer.py	2008-12-19 13:30:53 UTC (rev 1353)
@@ -25,12 +25,12 @@
   mandatory = {'Package': 0, 'Version': 0, 'Architecture': 0, 'Maintainer': 0,
       'Description': 0}
   non_mandatory = {'Source': 0, 'Essential': 0, 'Depends': 0, 'Recommends': 0,
-      'Suggests': 0, 'Enhances': 0, 'Pre-Depends': 0, 'Installed-Size': 0,
+      'Suggests': 0, 'Enhances': 0, 'Pre-Depends': 0, 'Breaks':0, 'Installed-Size': 0,
       'Homepage': 0, 'Size': 0, 'Build-Essential':0, 'Origin':0,
       'SHA1':0, 'Replaces':0, 'Section':0, 'MD5sum':0, 'Bugs':0, 'Priority':0,
       'Tag':0, 'Task':0, 'Python-Version':0, 'Provides':0, 'Conflicts':0,
       'SHA256':0, 'Original-Maintainer':0}
-  ignorable = {'Filename':0}
+  ignorable = {'Filename':0, 'Npp-Name':0, 'Npp-Mimetype':0, 'Npp-Applications':0, 'Python-Runtime':0, 'Npp-File':0, 'Npp-Description':0, 'Url':0, 'Gstreamer-Elements':0, 'Gstreamer-Version':0, 'Gstreamer-Decoders':0, 'Gstreamer-Uri-Sinks':0, 'Gstreamer-Encoders':0, 'Gstreamer-Uri-Sources':0 }
 
   warned_about = {}
   # A mapping from <package-name><version> to 1 If <package-name><version> is
@@ -112,7 +112,7 @@
 	  (%(Package)s, %(Version)s, %(Architecture)s, %(Maintainer)s,
 	  %(Description)s, %(Source)s, %(Source_Version)s, %(Essential)s,
 	  %(Depends)s, %(Recommends)s, %(Suggests)s, %(Enhances)s,
-	  %(Pre-Depends)s, %(Installed-Size)s, %(Homepage)s, %(Size)s,
+	  %(Pre-Depends)s, %(Breaks)s, %(Installed-Size)s, %(Homepage)s, %(Size)s,
 	  %(Build-Essential)s, %(Origin)s, %(SHA1)s,
 	  %(Replaces)s, %(Section)s, %(MD5sum)s, %(Bugs)s, %(Priority)s,
 	  %(Tag)s, %(Task)s, %(Python-Version)s, %(Provides)s,
@@ -162,7 +162,7 @@
 	  cur.execute("""PREPARE package_insert AS INSERT INTO %s
 	    (Package, Version, Architecture, Maintainer, Description, Source,
 	    Source_Version, Essential, Depends, Recommends, Suggests, Enhances,
-	    Pre_Depends, Installed_Size, Homepage, Size,
+	    Pre_Depends, Breaks, Installed_Size, Homepage, Size,
 	    build_essential, origin, sha1, replaces, section,
             md5sum, bugs, priority, tag, task, python_version,
             provides, conflicts, sha256, original_maintainer,

Modified: udd/udd/sources_gatherer.py
===================================================================
--- udd/udd/sources_gatherer.py	2008-12-19 13:30:35 UTC (rev 1352)
+++ udd/udd/sources_gatherer.py	2008-12-19 13:30:53 UTC (rev 1353)
@@ -26,9 +26,11 @@
       'Checksums-Sha256':0, 'Original-Maintainer':0, 'Dm-Upload-Allowed':0} 
   ignorable = {'Vcs-Arch': 0, 'Vcs-Bzr': 0,
       'Vcs-Cvs': 0, 'Vcs-Darcs': 0, 'Vcs-Git': 0, 'Vcs-Hg': 0, 'Vcs-Svn': 0,
-      'X-Vcs-Browser': 0, 'Vcs-Browser': 0, 'X-Vcs-Bzr': 0, 'X-Vcs-Darcs': 0, 'X-Vcs-Svn': 0,
-      'Directory':0}
-  vcs = { 'Arch':0, 'Bzr':0, 'Cvs':0, 'Darcs':0, 'Git':0, 'Hg':0, 'Svn':0}
+      'Vcs-Mtn':0,
+      'X-Vcs-Browser': 0, 'Vcs-Browser': 0, 'X-Vcs-Bzr': 0, 'X-Vcs-Darcs': 0, 'X-Vcs-Svn': 0, 'Vcs-Browse':0,
+      'Directory':0, 'Comment':0, 'Origin':0, 'Url':0, 'X-Collab-Maint':0, 'Autobuild':0, 'Vcs-Cvs:':0, 'Python-Standards-Version':0}
+      #Vcs-Cvs: is caused by a bug in python-debian, apparently.
+  vcs = { 'Arch':0, 'Bzr':0, 'Cvs':0, 'Darcs':0, 'Git':0, 'Hg':0, 'Svn':0, 'Mtn':0}
 
   warned_about = {}
 
@@ -67,6 +69,8 @@
         d['Vcs-Browser'] = control["Vcs-Browser"]
     elif control.has_key("X-Vcs-Browser"):  
         d['Vcs-Browser'] = control["X-Vcs-Browser"]
+    if control.has_key("Vcs-Browse"):  # common typo
+        d['Vcs-Browser'] = control["Vcs-Browse"]
     else:
         d['Vcs-Browser'] = None