[Reproducible-commits] [misc] 02/02: report: small fixes

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository misc.

commit e48b94a0d5ebb7cb3cb8d35dabea82988873065b
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Nov 19 12:01:02 2015 +0000

    report: small fixes
---
 reports/README                 |  2 +-
 reports/bin/newly-reproducible | 10 ++++++++--
 reports/template.mdwn          |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/reports/README b/reports/README
index cc629eb..29e90a2 100644
--- a/reports/README
+++ b/reports/README
@@ -34,7 +34,7 @@ Process
    To download all the changelogs, one can do:
 
        $ mkdir changelogs
-       $ for url in $(bin/newly-reproducible | sed -n -e 's,.*<,,;s,>.*,,p') | sort -u; do
+       $ for url in $(bin/newly-reproducible | sed -n -e 's,.*<,,;s,>.*,,p' | sort -u); do
              p=${url%/*}; p=${p##*/};
              torsocks wget -O changelogs/$p $url;
          done
diff --git a/reports/bin/newly-reproducible b/reports/bin/newly-reproducible
index 616036b..284cf77 100755
--- a/reports/bin/newly-reproducible
+++ b/reports/bin/newly-reproducible
@@ -4,6 +4,7 @@
 # Copyright © 2015 Lunar <lunar at debian.org>
 # Licensed under WTFPL — http://www.wtfpl.net/txt/copying/
 
+import os
 import re
 import sys
 import sqlite3
@@ -13,7 +14,8 @@ query_add = ''
 if len(sys.argv) > 1:
     query_add = "AND name IN ({})".format(', '.join(map(repr, sys.argv[1:])))
 
-conn = sqlite3.connect('reproducible.db')
+db_path = os.environ.get('REPRODUCIBLE_DB', 'reproducible.db')
+conn = sqlite3.connect(db_path)
 
 c = conn.cursor()
 
@@ -25,6 +27,7 @@ for name, reproducible_version, architecture, suite, reproducible_build_time in
         continue
     c2 = conn.cursor()
     for version, status, build_time in c2.execute('SELECT version, status, strftime("%s", build_date) FROM stats_build WHERE name = ? AND architecture = ? AND suite = ? AND build_date < DATETIME(?, "unixepoch") ORDER BY build_date DESC', (name, architecture, suite, int(reproducible_build_time) - 1)):
+        #print("status %s" % status)
         if status in ('FTBFS', 'depwait'):
             continue
         elif status == 'reproducible':
@@ -37,7 +40,10 @@ for name, reproducible_version, architecture, suite, reproducible_build_time in
         elif status == 'unreproducible':
             if version == reproducible_version:
                 now_reproducible[package_id] = 'likely due to toolchain fixes'
-            elif package_id not in unreproducible_version:
+            elif package_id in unreproducible_version:
+                if unreproducible_version[package_id] != version:
+                   break
+            else:
                 if name.startswith('lib'):
                     prefix = name[0:4]
                 else:
diff --git a/reports/template.mdwn b/reports/template.mdwn
index 3116c87..f3c8d96 100644
--- a/reports/template.mdwn
+++ b/reports/template.mdwn
@@ -15,12 +15,12 @@ Toolchain fixes
 Packages fixed
 --------------
 
-The following 549 packages became reproducible due to changes in their
+The following 549 packages have become reproducible due to changes in their
 build dependencies:
 
 The following packages became reproducible after getting fixed:
 
-Some uploads fixed some reproducibility issues but not all of them:
+Some uploads fixed some reproducibility issues, but not all of them:
 
 Patches submitted which have not made their way to the archive yet:
 

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