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

[Andreas Tille]

Author: tille
Date: 2010-08-16 20:26:53 +0000 (Mon, 16 Aug 2010)
New Revision: 1776

Modified:
   udd/udd/ddtp_gatherer.py
Log:
Try to reduce warning noise in case there is more than one description found


Modified: udd/udd/ddtp_gatherer.py
===================================================================
--- udd/udd/ddtp_gatherer.py	2010-08-15 08:05:57 UTC (rev 1775)
+++ udd/udd/ddtp_gatherer.py	2010-08-16 20:26:53 UTC (rev 1776)
@@ -101,8 +101,8 @@
                    description || E'\n' || long_description AS full_description
                   FROM packages
                   WHERE package = $1 AND distribution = $2 AND component = $3 AND
-                  release = $4 AND version = $5 AND architecture = 'i386'
-               ) AS tmp GROUP BY full_description"""
+                  release = $4 AND version = $5 AND architecture in ('all', 'i386', 'amd64')
+               ) AS tmp GROUP BY full_description LIMIT 1"""
     self.log.debug("execute query %s", query)
     cur.execute(query)
 
@@ -185,7 +185,7 @@
               self.log.debug("execute query %s", query)
               cur.execute(query)
               if cur.rowcount <= 0:
-                self.log.warning("Did not find description for i386 in %s",
+                self.log.warning("Did not find description for most frequent architectures in %s",
                                  ", ".join([self.pkg.package, self.pkg.distribution, self.pkg.component,
                                             self.pkg.release, self.pkg.version]))
                 continue