[Piuparts-commits] [piuparts] 13/20: p-r: sort maintainer summary by state

[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 abd5f15dcccc36e3bab16707ba80c2e14ebf9619
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Nov 9 17:27:04 2013 +0100

    p-r: sort maintainer summary by state
    
    move failing packages on top
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 TODO               | 4 ----
 debian/changelog   | 1 +
 piuparts-report.py | 7 ++++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 57c4cc5..13b7e83 100644
--- a/TODO
+++ b/TODO
@@ -31,10 +31,6 @@ for 0.5x:
   - examples are duplicated in piuparts.1.txt and README.txt - only keep one copy.
   - README_server has some duplication information on configuration as well.
 
-- in maintainer view:
-  - sort buggy states up again
-  - sort packages on maintainer pages alphabetically (states first though)
-
 - more stats and graphs:
   - packages processed per day and section
     - master writes submissions.txt per section since 0.45
diff --git a/debian/changelog b/debian/changelog
index 9a5c659..c3a9d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ piuparts (0.56) UNRELEASED; urgency=low
     - Report URLs of all Packages files used for a section.
     - Avoid reporting duplicate dependencies after stripping versioning.
     - Fix some invalid HTML constructs.
+    - Sort maintainer summary by state: failing packages on top.
   * Improve exception handling.
   * known_problems: Upgrade adequate issue 'missing-copyright-file' from
     boring to normal and make pre_remove_50_find_missing_copyright no longer
diff --git a/piuparts-report.py b/piuparts-report.py
index 878aed7..c1abf07 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -938,14 +938,15 @@ class Section:
             if not os.path.exists(maintainer_subdir_path):
                 os.mkdir(maintainer_subdir_path)
             rows = ""
-            package_rows = ""
+            package_rows = {}
             packages = {}
             for state in states:
                 packages[state] = []
+                package_rows[state] = ""
             for source in sorted(sources):
                 (state, sourcerows, binaryrows) = source_data[source]
                 packages[state].append(source)
-                package_rows += sourcerows + binaryrows
+                package_rows[state] += sourcerows + binaryrows
 
             for state in states:
                 if len(packages[state]) > 0:
@@ -989,7 +990,7 @@ class Section:
                                           + self._config.section),
                "maintainer": html_protect(maintainer+" in "+self._config.section),
                "distrolinks": distrolinks,
-               "rows": rows + package_rows,
+               "rows": rows + "".join([package_rows[state] for state in states]),
                     })
 
     def create_source_summary (self, source, logs_by_dir):

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