[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 4d4af8d0af42675af898c80f80e6ce9f3f1edad7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Apr 9 11:09:50 2013 +0200

    p-r: properly report version of binary packages
    
    which may be different from the version of their source package
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 5eb4eff..79a7d22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ piuparts (0.51) UNRELEASED; urgency=low
     - "Missing" binary packages don't influence the overall test result of a
       source package. These are either udebs or for other architectures.
       (Closes: #699160)
+    - Report the correct version for binary packages.
   * Makefile:
   * detect_well_known_errors:
     - Skip sections that don't exist in piuparts.conf.
diff --git a/piuparts-report.py b/piuparts-report.py
index e745cb2..c364b9f 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -920,7 +920,6 @@ class Section:
         binaries = self._source_db.get_control_header(source, "Binary")
         maintainer = self._source_db.get_control_header(source, "Maintainer")
         uploaders = self._source_db.get_control_header(source, "Uploaders")
-        current_version = self._source_db.get_control_header(source, "Version")
 
         success = True
         failed = False
@@ -946,6 +945,7 @@ class Section:
           else:
             state_style="labelcell"
 
+          binary_version = self._binary_db.get_control_header(binary, "Version")
           binaryrows +=   "<tr class=\"normalrow\">" \
                         + "<td class=\"labelcell\">Binary:</td>" \
                         + "<td class=\"contentcell2\">%s</td>" \
@@ -957,7 +957,7 @@ class Section:
                               self.links_to_logs(binary, state, logs_by_dir) ) \
                         + "<td class=\"labelcell\">Version:</td>" \
                         + "<td class=\"contentcell2\">%s</td>" \
-                          % html_protect(current_version) \
+                          % html_protect(binary_version) \
                         + "</tr>\n"
 
           if state not in ("successfully-tested", "essential-required"):

-- 
piuparts git repository