[Piuparts-commits] rev 337 - trunk

[Holger Levsen]

Author: holger
Date: 2009-04-12 21:57:15 +0000 (Sun, 12 Apr 2009)
New Revision: 337

Modified:
   trunk/TODO
   trunk/piuparts-report.py
Log:
improve package view

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-04-12 12:19:13 UTC (rev 336)
+++ trunk/TODO	2009-04-12 21:57:15 UTC (rev 337)
@@ -6,10 +6,9 @@
 - report:
 --- write_sources_summaries() should be split in prepare_ and assemble_. assemble_ should use find_log() to build all needed pages
 --- find_log() is not used atm
---- $package in $section
 --- include pts links
---- include links to logfiles in source summary pages
 --- include links to http://qa.debian.org/developer.php?login=$maintainer_email
+--- include links to logfiles in source summary pages
 --- dont write counts.txt if it has already been written that day
 -- slave
 --- mention distro when sending logs

Modified: trunk/piuparts-report.py
===================================================================
--- trunk/piuparts-report.py	2009-04-12 12:19:13 UTC (rev 336)
+++ trunk/piuparts-report.py	2009-04-12 21:57:15 UTC (rev 337)
@@ -253,10 +253,11 @@
       $section statistics
      </td>
     </tr>
-     <tr class="normalrow">
+    <tr class="normalrow">
      <td class="contentcell2" colspan="3">
       $description
      </td>
+    </tr>
     <tr class="titlerow">
      <td class="titlecell" colspan="3">
       Packages per state
@@ -279,21 +280,21 @@
 SOURCE_PACKAGE_BODY_TEMPLATE = """
    <table class="righttable">
     <tr class="titlerow">
-     <td class="titlecell" colspan="2">
-      Source package
+     <td class="titlecell" colspan="3">
+      Package $package
      </td>
     </tr>
     <tr class="normalrow">
-     <td class="contentcell2" colspan="2">
-       $source
+     <td class="contentcell2" colspan="3">
+      $source
      </td>
     </tr>
-     <tr class="titlerow">
-     <td class="titlecell" colspan="2">
+    <tr class="titlerow">
+     <td class="titlecell" colspan="3">
       Binary package(s) in $section
      </td>
     </tr>
-     $binaryrows
+    $binaryrows
    </table>
 """
 
@@ -668,13 +669,18 @@
         for source in self._source_db.get_all_packages():
                 binaries = self._source_db.get_control_header(source, "Binary")
                 maintainer = self._source_db.get_control_header(source, "Maintainer")
-                version = self._source_db.get_control_header(source, "Version")
                 success = True
                 failed = False
                 binaryrows = ""
                 for binary in binaries.split(", "):
                   state = self._binary_db.state_by_name(binary)
-                  binaryrows += "<tr class=\"normalrow\"><td class=\"contentcell2\">%s</td><td class=\"contentcell2\">%s</td></tr>" % (binary, state)
+                  version = self._binary_db.get_control_header(binary, "Version")
+                  binaryrows += "
+                                 <tr class=\"normalrow\">
+                                  <td class=\"contentcell2\">%s</td>
+                                  <td class=\"contentcell2\">%s</td>
+                                  <td class=\"contentcell2\">%s</td>
+                                 </tr>" % (binary, state, version)
                   if state != "successfully-tested":
                     success = False
                   if state == "failed-testing":
@@ -692,7 +698,7 @@
                 f.write(htmlpage.safe_substitute( {
                     "section_navigation": create_section_navigation(self._section_names),
                     "time": time.strftime("%Y-%m-%d %H:%M %Z"),
-                    "source": html_protect(source+", "+maintainer+", "+version),
+                    "source": html_protect(source+", "+maintainer),
                     "section": html_protect(self._config.section),
                     "binaryrows": binaryrows,
                     }))