[Qa-jenkins-scm] [jenkins.debian.net] 01/02: chroot-installation: refactor pyton to generate yaml

[Holger Levsen]

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 de3d0bf5a6c2a29300d7130c7dbfc8d447b4e18c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Apr 7 14:21:50 2017 +0200

    chroot-installation: refactor pyton to generate yaml
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 job-cfg/chroot-installation.yaml.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index 1a15145..ac94c24 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -83,16 +83,16 @@ all_targets = [
 #
 def is_target_in_distro(distro, target):
          # qt5, education-desktop-mate and cinnamon weren't in wheezy. debconf-video is not interested in wheezy anymore neither
-         if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' or target == 'qt5' or target == 'debconf-video' ):
+         if distro == 'wheezy' and target in ('education-desktop-mate', 'cinnamon', 'qt5', 'debconf-video'):
              return False
          # sugar has been removed from jessie and thus education-desktop-sugar has been removed from jessie and sid - it's also not yet available in stretch again...
-         elif (distro == 'sid' or distro == 'jessie' or distro == 'stretch') and ( target == 'education-desktop-sugar' ):
+         elif distro in ('sid', 'jessie', 'stretch') and target == 'education-desktop-sugar':
              return False
         # education-ltsp-server has just been introduced in sid…
-         elif (distro == 'wheezy' or distro == 'jessie' or distro == 'stretch') and ( target == 'education-ltsp-server' ):
+         elif distro in ('wheezy', 'jessie', 'stretch') and target == 'education-ltsp-server':
              return False
         # education-thin-client-server will become obsolete in stretch…
-         elif (distro == 'sid') and ( target == 'education-thin-client-server' ):
+         elif distro == 'sid' and target == 'education-thin-client-server':
              return False
          return True
 

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