[Qa-jenkins-scm] [jenkins.debian.net] 04/04: reproducible: html_{notes, packages}: avoid collecting garbage 3 times in a row. One is enough

Holger Levsen holger at moszumanska.debian.org
Wed Jul 8 11:51:01 UTC 2015


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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit a03d782764a665c8b1cde954e59ff1d7f8eea7de
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Wed Jul 8 11:44:58 2015 +0000

    reproducible: html_{notes,packages}: avoid collecting garbage 3 times in a row. One is enough
---
 bin/reproducible_html_notes.py    | 2 +-
 bin/reproducible_html_packages.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py
index 56d00b5..ad53f8c 100755
--- a/bin/reproducible_html_notes.py
+++ b/bin/reproducible_html_notes.py
@@ -322,7 +322,7 @@ def purge_old_notes(notes):
             except IndexError:  # the package is not tested. this can happen if
                 pass            # a package got removed from the archive
     if to_rebuild:
-        gen_packages_html(to_rebuild)
+        gen_packages_html(to_rebuild, no_clean=True)
 
 
 def purge_old_issues(issues):
diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py
index a8a920a..90faa46 100755
--- a/bin/reproducible_html_packages.py
+++ b/bin/reproducible_html_packages.py
@@ -235,7 +235,9 @@ def gen_packages_html(packages, suite=None, arch=None, no_clean=False, nocheck=F
     if nocheck and (not suite or not arch):
         for lsuite in SUITES:
             for larch in ARCHES:
-                gen_packages_html(packages, lsuite, larch, no_clean, True)
+                gen_packages_html(packages, lsuite, larch, True, True)
+        if not no_clean:
+            purge_old_pages()
         return
     for pkg in sorted(packages):
         pkg = str(pkg)

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



More information about the Qa-jenkins-scm mailing list