[Piuparts-commits] [piuparts] 04/17: p-r: report all Packages files used for a section

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 785165c52d57bfff8e8f55e95fcb5e427bfcbb4f
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Nov 5 18:54:16 2013 +0100

    p-r: report all Packages files used for a section
    
    and show the URLs actually loaded
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog   |    2 ++
 piuparts-report.py |    5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89ea179..48ebd34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ piuparts (0.56) UNRELEASED; urgency=low
   * piupartslib/__init__.py:
     - open_packages_url(): Try Packages.gz if Packages.bz2 is not available.
       (Closes: #711157)
+  * piuparts-report.py:
+    - Report URLs of all Packages files used for a section.
 
  -- Andreas Beckmann <anbe at debian.org>  Tue, 22 Oct 2013 22:16:21 +0200
 
diff --git a/piuparts-report.py b/piuparts-report.py
index 592c426..991b5a8 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -1224,9 +1224,6 @@ class Section:
 
         tablerows += "<tr class=\"normalrow\"> <td class=\"labelcell2\">Total</td> <td class=\"labelcell2\" colspan=\"2\">%d</td></tr>\n" % total_packages
         htmlpage = string.Template(HTML_HEADER + SECTION_INDEX_BODY_TEMPLATE + HTML_FOOTER)
-        # FIXME: list all urls instead of just one
-        packages_url = self._distro_config.get_packages_urls(
-                self._config.get_distro(), self._config.get_area(), self._config.get_arch())[0]
         vendor = "Debian"
         if len(self._config.get_distros()) > 1:
             description = "%s %s: package installation in %s" % (
@@ -1254,7 +1251,7 @@ class Section:
             "section": html_protect(self._config.section),
             "description": html_protect(description),
             "tablerows": tablerows,
-            "packagesurl": html_protect(packages_url),
+            "packagesurl": "<br>".join([html_protect(url) for url in self._binary_db.get_urls()]),
             "doc_root": self._doc_root,
            }))
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git