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

Andreas Tille tille at alioth.debian.org
Fri Feb 3 08:27:19 UTC 2012


Author: tille
Date: 2012-02-03 08:27:19 +0000 (Fri, 03 Feb 2012)
New Revision: 2135

Modified:
   udd/sql/setup.sql
   udd/sql/upgrade.sql
   udd/udd/packages_gatherer.py
Log:
Inject patch from Stuart Prescott <stuart+debian at nanonanonano.net> to handle Description-md5 field which is needed to address english long descriptions from english "Translations"


Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2012-02-03 08:23:04 UTC (rev 2134)
+++ udd/sql/setup.sql	2012-02-03 08:27:19 UTC (rev 2135)
@@ -59,7 +59,7 @@
 
 CREATE TABLE packages
   (package text, version debversion, architecture text, maintainer text, maintainer_name text, maintainer_email text, description
-    text, long_description text, source text, source_version debversion, essential text, depends text,
+    text, long_description text, description_md5 text, source text, source_version debversion, essential text, 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,
@@ -113,7 +113,7 @@
 
 CREATE TABLE ubuntu_packages
   (package text, version debversion, architecture text, maintainer text, maintainer_name text, maintainer_email text, description
-    text, long_description text, source text, source_version debversion, essential text, depends text,
+    text, long_description text, description_md5 text, source text, source_version debversion, essential text, 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,
@@ -168,7 +168,7 @@
 
 CREATE TABLE derivatives_packages
   (package text, version debversion, architecture text, maintainer text, maintainer_name text, maintainer_email text, description
-    text, long_description text, source text, source_version debversion, essential text, depends text,
+    text, long_description text, description_md5 text, source text, source_version debversion, essential text, 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,

Modified: udd/sql/upgrade.sql
===================================================================
--- udd/sql/upgrade.sql	2012-02-03 08:23:04 UTC (rev 2134)
+++ udd/sql/upgrade.sql	2012-02-03 08:27:19 UTC (rev 2135)
@@ -344,3 +344,9 @@
 -- 2011-05-31
 ALTER TABLE bugs add done_date timestamp;
 ALTER TABLE archived_bugs add done_date timestamp;
+
+-- 2012-01-23
+-- description-less packages files
+ALTER TABLE packages add description_md5 text;
+ALTER TABLE ubuntu_packages add description_md5 text;
+ALTER TABLE derivatives_packages add description_md5 text;

Modified: udd/udd/packages_gatherer.py
===================================================================
--- udd/udd/packages_gatherer.py	2012-02-03 08:23:04 UTC (rev 2134)
+++ udd/udd/packages_gatherer.py	2012-02-03 08:27:19 UTC (rev 2135)
@@ -32,13 +32,13 @@
       '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, 'Ruby-Versions':0, 'Provides':0, 'Conflicts':0,
-      'SHA256':0, 'Original-Maintainer':0}
+      'SHA256':0, 'Original-Maintainer':0, 'Description-md5':0}
   ignorable = {'Modaliases':0, 'Filename':0, 'Npp-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, 'url':0, 'Vdr-PatchLevel':0, 'Vdr-Patchlevel':0, 'originalmaintainer':0, 'Originalmaintainer':0, 'Build-Recommends':0, 'Multi-Arch':0, 'Maintainer-Homepage':0, 'Tads2-Version':0, 'Tads3-Version':0, 'Xul-Appid': 0, 'Subarchitecture':0, 'Package-Type':0, 'Kernel-Version': 0, 'Installer-Menu-Item':0, 'Supported':0, 'subarchitecture':0, 'package-type':0, 'Python3-Version':0, 'Built-Using':0 }
   ignorable_re = re.compile("^(Orig-|Original-|Origianl-|Orginal-|Orignal-|Orgiinal-|Orginial-|Debian-|X-Original-|Upstream-)")
 
   pkgquery = """EXECUTE package_insert
       (%(Package)s, %(Version)s, %(Architecture)s, %(Maintainer)s, %(maintainer_name)s, %(maintainer_email)s,
-      %(Description)s, %(Long_Description)s, %(Source)s, %(Source_Version)s, %(Essential)s,
+      %(Description)s, %(Long_Description)s, %(Description-md5)s, %(Source)s, %(Source_Version)s, %(Essential)s,
       %(Depends)s, %(Recommends)s, %(Suggests)s, %(Enhances)s,
       %(Pre-Depends)s, %(Breaks)s, %(Installed-Size)s, %(Homepage)s, %(Size)s,
       %(Build-Essential)s, %(Origin)s, %(SHA1)s,
@@ -171,7 +171,7 @@
 	path = os.path.join(src_cfg['directory'], comp, 'binary-' + arch, 'Packages.gz')
 	try:
 	  cur.execute("""PREPARE package_insert AS INSERT INTO %s
-	    (Package, Version, Architecture, Maintainer, maintainer_name, maintainer_email, Description, Long_Description, Source,
+	    (Package, Version, Architecture, Maintainer, maintainer_name, maintainer_email, Description, Long_Description, description_md5, Source,
 	    Source_Version, Essential, Depends, Recommends, Suggests, Enhances,
 	    Pre_Depends, Breaks, Installed_Size, Homepage, Size,
 	    build_essential, origin, sha1, replaces, section,
@@ -181,7 +181,7 @@
 	  VALUES
 	    ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
 	      $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28,
-	      $29, $30, $31, $32, $33, $34, $35, $36, '%s', '%s', '%s')
+	      $29, $30, $31, $32, $33, $34, $35, $36, $37, '%s', '%s', '%s')
 	    """ %  (table, self._distr, src_cfg['release'], comp))
 #	  aux.print_debug("Reading file " + path)
 	  # Copy content from gzipped file to temporary file, so that apt_pkg is




More information about the Collab-qa-commits mailing list