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

[tille at alioth.debian.org]

Author: tille
Date: 2008-02-14 21:12:45 +0000 (Thu, 14 Feb 2008)
New Revision: 1378

Modified:
   trunk/community/infrastructure/test/cddtasktools.py
Log:
Please check this - it should work now.  Some minor enhancements (command
line options for other CDDs, etc.) can follow later.


Modified: trunk/community/infrastructure/test/cddtasktools.py
===================================================================
--- trunk/community/infrastructure/test/cddtasktools.py	2008-02-14 17:22:07 UTC (rev 1377)
+++ trunk/community/infrastructure/test/cddtasktools.py	2008-02-14 21:12:45 UTC (rev 1378)
@@ -151,7 +151,15 @@
         # datastructure
         ret = {}
         if dependencytypes == ():
-            dependencytypes=('official', 'unofficial', 'prospective')
+            # official:    A package with this name is found in the Debian repository
+            # unofficial:  The tasks file contains a tag Pkg-URL for the package which is not None
+            # prospective: At least a short and long description are attached to a package name which
+            #              is not in the Debian pool and has no Pkg-URL for an unofficial package
+            # unknown:     Any other package names that are listed as Dependencies but have
+            #              incomplete information.  This usually happens when packages are not
+            #              available in Debian any more (for instance this might happen if a
+            #              name has changed)
+            dependencytypes=('official', 'unofficial', 'prospective', 'unknown')
         for task in self.tasknames:
             tdeps = self.tasks[task]
             list = []
@@ -168,7 +176,7 @@
         # datastructure
         ret = []
         if dependencytypes == ():
-            dependencytypes=('official', 'unofficial', 'prospective')
+            dependencytypes=('official', 'unofficial', 'prospective', 'unknown')
         tdeps = self.tasks[task]
         for dep in dependencytypes:
             for tdep in tdeps.dependencies[dep]:
@@ -212,7 +220,8 @@
         # instances
         self.dependencies = { 'official'    : [],
                               'unofficial'  : [],
-                              'prospective' : []
+                              'prospective' : [],
+                              'unknown'     : []
                             }
         self.available = available
 
@@ -352,7 +361,9 @@
             return 'official'
         if dep.pkgURL != None:
             return 'unofficial'
-        return 'prospective'
+        if dep.pkgShortDesc != None and dep.pkgLongDesc != None:
+            return 'prospective'
+        return 'unknown'
 
 
 class Available: