[Piuparts-commits] [piuparts] 03/05: p.conf.*: jessie: always --warn-on-debsums-errors

[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 3aee437bfb6d6a0d0bf0bf12e313ed8893d9a73d
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Dec 18 10:48:51 2014 +0100

    p.conf.*: jessie: always --warn-on-debsums-errors
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog                           |  2 ++
 instances/piuparts.conf.anbe               | 14 ++++++--------
 instances/piuparts.conf.pejacevic          |  8 ++------
 instances/piuparts.conf.piu-slave-1und1-01 |  8 ++------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de64cd7..fb1773c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ piuparts (0.62) UNRELEASED; urgency=medium
       symlinks: report all symlinks and their targets.
     - Reinstall base system packages missing upon removal with
       --no-install-recommends.
+  * piuparts.conf:
+    - Enable --warn-on-debsums-errors for all jessie tests.
   * distros.conf: Reactivate 'testing' and 'stable' aliases, switch them back
     to 'jessie' and 'wheezy' for ongoing development.
   * piuparts-slave.py:
diff --git a/instances/piuparts.conf.anbe b/instances/piuparts.conf.anbe
index d48fde4..e2f6258 100644
--- a/instances/piuparts.conf.anbe
+++ b/instances/piuparts.conf.anbe
@@ -29,8 +29,6 @@ flags-end-stretch =
 flags-start-jessie =
 flags-end-jessie =
 	--scriptsdir /etc/piuparts/scripts-jessie
-flags-end-jessie-upgrade =
-	%(flags-end-jessie)s
 	--warn-on-debsums-errors
 
 flags-start-wheezy =
@@ -1475,7 +1473,7 @@ precedence = 80
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 arch = amd64
 area = main
 components = main
@@ -1487,7 +1485,7 @@ precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy2jessie/main wheezy2jessie/non-free
 arch = amd64
 area = contrib
@@ -1499,7 +1497,7 @@ precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy2jessie/main wheezy2jessie/contrib
 arch = amd64
 area = non-free
@@ -1512,7 +1510,7 @@ precedence = 80
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy/main
 distro = wheezy-backports
 arch = amd64
@@ -1525,7 +1523,7 @@ precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy/main wheezy/non-free wheezy2bpo2jessie/main wheezy2bpo2jessie/non-free
 distro = wheezy-backports
 arch = amd64
@@ -1537,7 +1535,7 @@ precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy/main wheezy2bpo2jessie/main wheezy2bpo2jessie/contrib
 distro = wheezy-backports
 arch = amd64
diff --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index 062ee00..d884ea9 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -37,10 +37,6 @@ flags-start-jessie =
 flags-end-jessie =
 # extra fake-essential packages for successfully purging in jessie
 	--scriptsdir /etc/piuparts/scripts-jessie
-
-# common flags for tests ending in jessie after a distupgrade
-flags-end-jessie-upgrade =
-	%(flags-end-jessie)s
 # debsums failures won't be fixed in jessie, mostly related to
 # obsolete/renamed conffiles that moved to different packages
 	--warn-on-debsums-errors
@@ -221,7 +217,7 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 distro = wheezy
 upgrade-test-distros = wheezy jessie
 
@@ -232,7 +228,7 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy
 arch = amd64
 area = main
diff --git a/instances/piuparts.conf.piu-slave-1und1-01 b/instances/piuparts.conf.piu-slave-1und1-01
index d794848..307406c 100644
--- a/instances/piuparts.conf.piu-slave-1und1-01
+++ b/instances/piuparts.conf.piu-slave-1und1-01
@@ -37,10 +37,6 @@ flags-start-jessie =
 flags-end-jessie =
 # extra fake-essential packages for successfully purging in jessie
 	--scriptsdir /etc/piuparts/scripts-jessie
-
-# common flags for tests ending in jessie after a distupgrade
-flags-end-jessie-upgrade =
-	%(flags-end-jessie)s
 # debsums failures won't be fixed in jessie, mostly related to
 # obsolete/renamed conffiles that moved to different packages
 	--warn-on-debsums-errors
@@ -221,7 +217,7 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 distro = wheezy
 upgrade-test-distros = wheezy jessie
 
@@ -232,7 +228,7 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie-upgrade)s
+	%(flags-end-jessie)s
 depends-sections = wheezy
 arch = i386
 area = main

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