[Blends-commit] r2613 - /blends/trunk/webtools/blendstasktools.py

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Jan 20 17:09:54 2011
New Revision: 2613

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=2613
Log:
Make sure prospective packages are in alphabethical order, collect enhances in list to enable querieyn for bugs in enhancing packages

Modified:
    blends/trunk/webtools/blendstasktools.py

Modified: blends/trunk/webtools/blendstasktools.py
URL: http://svn.debian.org/wsvn/blends/blends/trunk/webtools/blendstasktools.py?rev=2613&op=diff
==============================================================================
--- blends/trunk/webtools/blendstasktools.py (original)
+++ blends/trunk/webtools/blendstasktools.py Thu Jan 20 17:09:54 2011
@@ -236,7 +236,7 @@
         conn = psycopg2.connect(host="localhost",port=DEFAULTPORT,user="guest",database="udd")
     except psycopg2.OperationalError:
 	# Hmmm, I observed a really strange behaviour on one of my machines where connecting to
-	# localhost does not work but 127.0.0.1 works fine.  No odea why ... but this should
+	# localhost does not work but 127.0.0.1 works fine.  No idea why ... but this should
 	# do the trick for the moment
 	conn = psycopg2.connect(host="127.0.0.1",port=DEFAULTPORT,user="guest",database="udd")
 
@@ -1304,6 +1304,7 @@
         query = "EXECUTE query_pkgs ('%s', '%s')" % (List2PgArray(alldepends), List2PgSimilarArray(alldepends))
         _execute_udd_query(query)
         pkgs_in_pool = []
+        enhancing_pkgs = []
         if curs.rowcount > 0:
             for row in RowDictionaries(curs):
                 # seek for package name in list of packages mentioned in tasks file
@@ -1360,6 +1361,7 @@
                 if row['enhanced']:
                     for pkg in row['enhanced']:
                         dep.properties['Enhances'][pkg] = PKGURLMASK % pkg
+                        enhancing_pkgs.append(pkg)
 
                 for i in range(len(row['releases'])):
                     dep.version.append({'release':row['releases'][i], 'version': row['versions'][i], 'archs':row['architectures'][i]})
@@ -1430,6 +1432,7 @@
                 dep.responsible = '<a href="mailto:%s">%s</a>' % (_url, to_unicode(_name))
 
                 pkgs_in_pool.append(dep.pkg)
+                # print "DEBUG: In task %s are the following enhancing packages" % self.task, enhancing_pkgs
                 # DEBUG
                 # print dep
 
@@ -1511,6 +1514,9 @@
                         if dep.desc['en'] == {}:
                             logger.error("Package %s neither in pool nor new and has no description - ignored" % dep.pkg)
 
+        for dependency in self.dependencies.keys():
+            self.dependencies[dependency].sort()
+
     def _QueryUDD4Package(self, source):
 
         query = "EXECUTE pkg_releases ('%s', '%s')" % (self.pkg, self.component)