[Piuparts-commits] [piuparts] 02/11: p-a: remove support for magic "$DISTRO/None" versions

[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 1530b40175ccbffdb9458315d33349562be48f15
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Apr 25 01:11:24 2017 +0200

    p-a: remove support for magic "$DISTRO/None" versions
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog                           | 1 +
 master-bin/report_newly_bugged_packages.in | 5 +----
 piuparts-analyze.py                        | 9 ++-------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99d925a..83ec966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ piuparts (0.77) UNRELEASED; urgency=medium
   * piuparts-analyze.py:
     - Process newest logfiles first, in case of timeouts.
     - Drop report_packages_with_many_logs(), obsoleted by archiving old logs.
+    - Remove support for magic "$DISTRO/None" versions.
   * piuparts-report.py:
     - Plot all states in the graphs.
     - Support new states in plots (varying number of columns in counts.txt).
diff --git a/master-bin/report_newly_bugged_packages.in b/master-bin/report_newly_bugged_packages.in
index b77e28c..7c3a5ae 100755
--- a/master-bin/report_newly_bugged_packages.in
+++ b/master-bin/report_newly_bugged_packages.in
@@ -32,10 +32,7 @@ OUTPUT=$(mktemp)
 for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION || continue
 		cd $MASTER/$SECTION
-		get_config_value DISTROS $SECTION upgrade-test-distros ''
-		distro=${DISTROS##* }
-		distro=${distro%-proposed}
-		timeout 60m @sharedir@/piuparts/piuparts-analyze $distro 2>&1 > $OUTPUT
+		timeout 60m @sharedir@/piuparts/piuparts-analyze 2>&1 > $OUTPUT
 		if [ $? = 124 ]; then
 			echo >> $OUTPUT
 			echo "Killed after timeout" >> $OUTPUT
diff --git a/piuparts-analyze.py b/piuparts-analyze.py
index ecff9f8..fe19a69 100644
--- a/piuparts-analyze.py
+++ b/piuparts-analyze.py
@@ -45,7 +45,6 @@ apt_pkg.init_system()
 
 error_pattern = re.compile(r"(?<=\n).*error.*\n?", flags=re.IGNORECASE)
 chroot_pattern = re.compile(r"tmp/tmp.*?'")
-distro = "?"
 
 
 def find_logs(directory):
@@ -136,9 +135,8 @@ def get_bug_versions(bug):
     for found_version in debianbts.get_status(bug)[0].found_versions:
         v = found_version.rsplit('/', 1)[-1]
         if v == "None":
-            # only allow the distro-qualified "$distro/None" version
-            if found_version == distro + "/" + v:
-                versions.append(v)
+            # ignore $DISTRO/None versions
+            pass
         else:
             versions.append(v)
     return list(reversed(sorted(versions, cmp=apt_pkg.version_compare))) or ['~']
@@ -254,9 +252,6 @@ def piuparts_bugs_affecting(package):
 
 
 def main():
-    if len(sys.argv) > 1:
-        global distro
-        distro = sys.argv[1]
     mark_logs_with_reported_bugs()
 
 

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