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

[lucas at alioth.debian.org]

Author: lucas
Date: 2009-01-25 14:15:17 +0000 (Sun, 25 Jan 2009)
New Revision: 1382

Modified:
   udd/udd/aux.py
   udd/udd/lintian_gatherer.py
   udd/udd/packages_gatherer.py
   udd/udd/sources_gatherer.py
Log:
convert to pyyaml, add some ignores, fix import of long descriptions

Modified: udd/udd/aux.py
===================================================================
--- udd/udd/aux.py	2009-01-25 14:14:16 UTC (rev 1381)
+++ udd/udd/aux.py	2009-01-25 14:15:17 UTC (rev 1382)
@@ -1,6 +1,6 @@
 """Auxillary methods for the UDD"""
 
-import syck
+import yaml
 import sys
 import psycopg2
 from os import path
@@ -54,7 +54,7 @@
 
 def load_config(str):
   """Load and check configuration from the string"""
-  config = syck.load(str)
+  config = yaml.load(str)
   if not 'general' in config:
     raise ConfigException('general section not specified')
   

Modified: udd/udd/lintian_gatherer.py
===================================================================
--- udd/udd/lintian_gatherer.py	2009-01-25 14:14:16 UTC (rev 1381)
+++ udd/udd/lintian_gatherer.py	2009-01-25 14:15:17 UTC (rev 1382)
@@ -18,7 +18,7 @@
   # (stolen from Russ Allbery, thanks dude)
   output_re = re.compile("([EWIXO]): (\S+)(?: (\S+))?: (\S+)(?:\s+(.*))?");
 
-  ignore_re = re.compile("^((gpg|secmem usage|warning|(/bin/)?tar|internal error|/usr/bin/xgettext|ERROR): |     )");
+  ignore_re = re.compile("^((gpg|secmem usage|warning|(/bin/)?tar|internal error|/usr/bin/xgettext|ERROR): |     |Use of uninitialized value in numeric lt .*)");
 
   code_to_tag_type_map = {
     "E": "error",

Modified: udd/udd/packages_gatherer.py
===================================================================
--- udd/udd/packages_gatherer.py	2009-01-25 14:14:16 UTC (rev 1381)
+++ udd/udd/packages_gatherer.py	2009-01-25 14:15:17 UTC (rev 1382)
@@ -31,8 +31,8 @@
       '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, '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, 'originalmaintainer':0 }
-  ignorable_re = re.compile("^(Original-|Origianl-|Debian-|X-Original-|Upstream-)")
+  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, 'url':0, 'Vdr-PatchLevel':0, 'Vdr-Patchlevel':0, 'originalmaintainer':0, 'Originalmaintainer':0, 'Build-Recommends':0 }
+  ignorable_re = re.compile("^(Original-|Origianl-|Orginal-|Debian-|X-Original-|Upstream-)")
 
   warned_about = {}
   # A mapping from <package-name><version> to 1 If <package-name><version> is
@@ -92,11 +92,11 @@
 
       # We just use the first line of the description
       if 'Description' in d:
-	d['Description'] = d['Description'].split("\n",1)[0]
 	if len(d['Description'].split("\n",1)) > 1:
 	  d['Long_Description'] = d['Description'].split("\n",1)[1]
 	else:
 	  d['Long_Description'] = ''
+	d['Description'] = d['Description'].split("\n",1)[0]
 
       # Convert numbers to numbers
       for f in ['Installed-Size', 'Size']:

Modified: udd/udd/sources_gatherer.py
===================================================================
--- udd/udd/sources_gatherer.py	2009-01-25 14:14:16 UTC (rev 1381)
+++ udd/udd/sources_gatherer.py	2009-01-25 14:15:17 UTC (rev 1382)
@@ -29,9 +29,9 @@
       'Vcs-Cvs': 0, 'Vcs-Darcs': 0, 'Vcs-Git': 0, 'Vcs-Hg': 0, 'Vcs-Svn': 0,
       'Vcs-Mtn':0,
       'X-Vcs-Browser': 0, 'Vcs-Browser': 0, 'X-Vcs-Bzr': 0, 'X-Vcs-Darcs': 0, 'X-Vcs-Svn': 0, 'X-Vcs-Hg':0, 'X-Vcs-Git':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, 'url':0, 'originalmaintainer':0}
+      'Directory':0, 'Comment':0, 'Origin':0, 'Url':0, 'X-Collab-Maint':0, 'Autobuild':0, 'Vcs-Cvs:':0, 'Python-Standards-Version':0, 'url':0, 'originalmaintainer':0, 'Originalmaintainer':0, 'Build-Recommends':0}
       #Vcs-Cvs: is caused by a bug in python-debian, apparently.
-  ignorable_re = re.compile("^(Original-|Origianl-|Debian-|X-Original-|Upstream-)")
+  ignorable_re = re.compile("^(Original-|Origianl-|Orginal-|Debian-|X-Original-|Upstream-)")
   vcs = { 'Arch':0, 'Bzr':0, 'Cvs':0, 'Darcs':0, 'Git':0, 'Hg':0, 'Svn':0, 'Mtn':0}
 
   warned_about = {}