[med-svn] r1345 - trunk/community/infrastructure/test

[tille at alioth.debian.org]

Author: tille
Date: 2008-02-09 18:06:43 +0000 (Sat, 09 Feb 2008)
New Revision: 1345

Modified:
   trunk/community/infrastructure/test/cddtasktools.py
   trunk/community/infrastructure/test/update-tasks
Log:
More fixes (not yet complete)


Modified: trunk/community/infrastructure/test/cddtasktools.py
===================================================================
--- trunk/community/infrastructure/test/cddtasktools.py	2008-02-09 15:42:14 UTC (rev 1344)
+++ trunk/community/infrastructure/test/cddtasktools.py	2008-02-09 18:06:43 UTC (rev 1345)
@@ -280,7 +280,10 @@
                         for component in self.available.components:
                             if dep.pkg in self.available.packages[component].keys():
                                 dep.component    = component
-                                (dep.pkgShortDesc, dep.pkgLongDesc) = self.available.packages[component][dep.pkg]
+                                dep.pkgShortDesc = self.available.packages[component][dep.pkg].pkgShortDesc
+                                dep.pkgLongDesc  = self.available.packages[component][dep.pkg].pkgLongDesc
+                                dep.homepage     = self.available.packages[component][dep.pkg].homepage
+                                dep.version      = self.available.packages[component][dep.pkg].version
                                 break # The same package should be only in one component
                                       # At least I currently see no reason for having a
                                       # package with the same name in main and contrib
@@ -288,7 +291,7 @@
                     continue
                 # The following keys will be mostly used for programs that
                 # are not yet existing in Debian and will go to our todo list
-                if key == 'Homepage':
+                if key == 'homepage':
                     if dep != None:
                         dep.homepage = stanza['homepage']
                     else:

Modified: trunk/community/infrastructure/test/update-tasks
===================================================================
--- trunk/community/infrastructure/test/update-tasks	2008-02-09 15:42:14 UTC (rev 1344)
+++ trunk/community/infrastructure/test/update-tasks	2008-02-09 18:06:43 UTC (rev 1345)
@@ -55,27 +55,31 @@
 			     cdeps.GetListOfDepsForTask(task, dependencytypes=('official',)),
 			     deppkg)
 
-	if task in todo:
-		error = True
-	else:
-		error = False
+#	if task in todo:
+#		error = True
+#	else:
+#		error = False
 
 	unofficial = cdeps.GetNamesOnlyDict(('unofficial',))
-	if task in unofficial:
+	if deppkg in cdeps.tasks[task].dependencies['unofficial']:
 		node.unofficial_head.raw = """<h2>
 <a id="inofficial-debs" name="inofficial-debs"></a>
 	Inofficial Debian packages
 </h2>"""
-		node.unofficial.repeat(renderUnofficial, unofficial[task])
+		node.unofficial.repeat(renderUnofficial,
+			       cdeps.GetListOfDepsForTask(task, dependencytypes=('unofficial',)),
+			       deppkg)
 		error = False
 
 	unavailable = cdeps.GetNamesOnlyDict(('prospective',))
-	if task in unavailable:
+	if deppkg in cdeps.tasks[task].dependencies['prospective']:
 		node.unavailable_head.raw = """<h2>
 <a id="debs-not-available" name="debs-not-available"></a>
 	Debian packages not available
 </h2>"""
-		node.unavailable.repeat(renderUnavailable, unavailable[task])
+		node.unavailable.repeat(renderUnavailable,
+			       cdeps.GetListOfDepsForTask(task, dependencytypes=('prospective',)),
+			       deppkg)
 		error = False
 
 	if error:
@@ -106,9 +110,9 @@
 	node.deburl.raw = "<img src=\"/img/deb-icon.png\" />"
 
 
-def renderUnofficial(node, package):
+def renderUnofficial(node, package, deppkg):
 	# Here we parse just unofficial packages
-	node.shortdesc.content = cdeps.tasks[task].dependencies['unofficial'][package].pkgShortDesc
+	node.shortdesc.content = deppkg.pkgShortDesc
 	node.longdesc.raw = cdeps.tasks[task].dependencies['unofficial'][package].pkgLongDesc
 	node.project.raw = "<table class=\"project\" summary=\"%s\">" % package['Package']
 	node.anchor.atts['name'] = package['Package']