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

[tille at alioth.debian.org]

Author: tille
Date: 2008-02-10 20:00:32 +0000 (Sun, 10 Feb 2008)
New Revision: 1349

Modified:
   trunk/community/infrastructure/test/cddtasktools.py
   trunk/community/infrastructure/test/update-tasks
Log:
eems quite similar to Davids work now


Modified: trunk/community/infrastructure/test/cddtasktools.py
===================================================================
--- trunk/community/infrastructure/test/cddtasktools.py	2008-02-10 07:09:17 UTC (rev 1348)
+++ trunk/community/infrastructure/test/cddtasktools.py	2008-02-10 20:00:32 UTC (rev 1349)
@@ -21,7 +21,7 @@
 
 from debian_bundle import deb822
 
-BASEURL  = 'http://ftp.debian.de/debian/dists/'
+BASEURL  = 'http://ftp.debian.org/'
 REPOS    = { 'debian-med'     : "svn://svn.debian.org/svn/cdd/projects/med/trunk/debian-med/tasks/",
              'debian-edu'     : "svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu/tasks/",
              'debian-science' : "svn://svn.debian.org/svn/cdd/projects/science/trunk/debian-science/tasks/",
@@ -87,6 +87,7 @@
                                    # who volunteered to care for this program
         self.license        = None # License of program
         self.section        = None # Section of package in the Debian hierarchy
+        self.filename       = None # Filename of package in the Debian pool
         self.wnpp           = None # WNPP bug number
         self.pkgShortDesc   = None # Prospective packages should have a description ...
         self.pkgLongDesc    = None # ... which could be copied to (or from if exists)
@@ -289,6 +290,7 @@
                                 dep.pkgURL       = 'http://packages.debian.org/' + 'unstable/' + \
                                                    self.available.packages[component][dep.pkg].section + \
                                                    '/' + dep.pkg
+                                dep.filename     = self.available.packages[component][dep.pkg].filename
                                 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
@@ -403,7 +405,7 @@
                 return
 
         for component in self.components:
-            f = urllib.urlopen(BASEURL+'/'+self.dist+'/'+component+'/'+self.binary+'/'+self.source)
+            f = urllib.urlopen(BASEURL+'/dists/'+self.dist+'/'+component+'/'+self.binary+'/'+self.source)
             compresseddata = f.read()
             compressedstream = StringIO.StringIO(compresseddata)
             g = gzip.GzipFile(fileobj=compressedstream)
@@ -418,6 +420,7 @@
                     deppkg.homepage = '.' # Something else in case unexpected things happen
                 deppkg.version  = stanza['version'].split('-')[0]
                 deppkg.section  = stanza['section']
+                deppkg.filename = BASEURL+stanza['filename']
                 self.packages[component][stanza['package']] = deppkg
             f.close()
 

Modified: trunk/community/infrastructure/test/update-tasks
===================================================================
--- trunk/community/infrastructure/test/update-tasks	2008-02-10 07:09:17 UTC (rev 1348)
+++ trunk/community/infrastructure/test/update-tasks	2008-02-10 20:00:32 UTC (rev 1349)
@@ -106,7 +106,7 @@
 		node.license.content = "License: %s" % deppkg.license
 	node.pkgurl.atts['href'] = deppkg.pkgURL
 	node.pkgurl.content = "Official Debian package"
-	node.deburl.atts['href'] =  'to be determined' # det[package]['Deb-URL']
+	node.deburl.atts['href'] = deppkg.filename
 	#~ node.deburl.content = "X" ### TODO: add a nice icon here to download the .deb package
 	node.deburl.raw = "<img src=\"/img/deb-icon.png\" />"