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

[tille at alioth.debian.org]

Author: tille
Date: 2008-02-08 22:50:05 +0000 (Fri, 08 Feb 2008)
New Revision: 1341

Modified:
   trunk/community/infrastructure/test/cddtasktools.py
   trunk/community/infrastructure/test/update-tasks_using_python-debian
Log:
Store homepage and version of available packages


Modified: trunk/community/infrastructure/test/cddtasktools.py
===================================================================
--- trunk/community/infrastructure/test/cddtasktools.py	2008-02-08 22:01:52 UTC (rev 1340)
+++ trunk/community/infrastructure/test/cddtasktools.py	2008-02-08 22:50:05 UTC (rev 1341)
@@ -81,7 +81,8 @@
 
         # The following keys will be mostly used for programs that
         # are not yet existing in Debian and will go to our todo list
-        self.homepage       = None # Homepage of program
+        self.homepage       = '#'  # Homepage of program
+        self.version        = None # Version of program
         self.responsible    = None # E-Mail address of issuer of ITP or some person
                                    # who volunteered to care for this program
         self.license        = None # License of program
@@ -372,7 +373,7 @@
             self.components = components
         # The dictionary packages contains the component as key
         # The values are dictionaries holding package names as key
-        # and a two element list (pkgShortDesc,pkgLongDesc) as values
+        # and a DependantPackage object as values
         self.packages = {}
         for component in self.components:
             self.packages[component] = {}
@@ -393,7 +394,16 @@
             compressedstream = StringIO.StringIO(compresseddata)
             g = gzip.GzipFile(fileobj=compressedstream)
             for stanza in deb822.Sources.iter_paragraphs(g, shared_storage=False):
-                self.packages[component][stanza['package']] = SplitDescription(stanza['description'])
+                deppkg = DependantPackage()
+                (deppkg.pkgShortDesc, deppkg.pkgLongDesc) = SplitDescription(stanza['description'])
+                try:
+                    deppkg.homepage = stanza['homepage']
+                except KeyError:
+                    deppkg.homepage = '#' # Not every package has a homepage tag
+                except:
+                    deppkg.homepage = '.' # Something else in case unexpected things happen
+                deppkg.version  = stanza['version']
+                self.packages[component][stanza['package']] = deppkg
             f.close()
 
 available = Available()

Modified: trunk/community/infrastructure/test/update-tasks_using_python-debian
===================================================================
--- trunk/community/infrastructure/test/update-tasks_using_python-debian	2008-02-08 22:01:52 UTC (rev 1340)
+++ trunk/community/infrastructure/test/update-tasks_using_python-debian	2008-02-08 22:50:05 UTC (rev 1341)
@@ -19,6 +19,26 @@
 
 from cddtasktools import Available, CddDependencies, Task, TaskDependencies, HTMLBASE
 
+available = Available()
+available.GetPackageNames()
+
+component = 'main'
+print "---------- %s ----------" % component
+for pkg in available.packages[component].keys():
+    print pkg, ':', available.packages[component][pkg].pkgShortDesc, '/', available.packages[component][pkg].homepage
+
+component = 'contrib'
+print "---------- %s ----------" % component
+for pkg in available.packages[component].keys():
+    print pkg, ':', available.packages[component][pkg].pkgShortDesc, '/', available.packages[component][pkg].homepage
+
+component = 'non-free'
+print "---------- %s ----------" % component
+for pkg in available.packages[component].keys():
+    print pkg, ':', available.packages[component][pkg].pkgShortDesc, '/', available.packages[component][pkg].homepage
+
+sys.exit(0)
+
 cdeps=CddDependencies('debian-med')
 cdeps.GetAllDependencies()
 
@@ -46,23 +66,4 @@
 
 sys.exit(0)
 
-available = Available()
-available.GetPackageNames()
 
-component = 'main'
-print "---------- %s ----------" % component
-for pkg in available.packages[component].keys():
-    print pkg, ':', available.packages[component][pkg][0]
-
-component = 'contrib'
-print "---------- %s ----------" % component
-for pkg in available.packages[component].keys():
-    print pkg, ':', available.packages[component][pkg][0]
-
-component = 'non-free'
-print "---------- %s ----------" % component
-for pkg in available.packages[component].keys():
-    print pkg, ':', available.packages[component][pkg][0]
-
-sys.exit(0)
-