Commit 217184cb authored by Holger Levsen's avatar Holger Levsen
Browse files

chroot-install: drop education-lang tests for releases != stretch 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 0d605bdf

bin/chroot-installation.sh

+3 −3
Original line number Diff line number Diff line 
#!/bin/bash

# vim: set noexpandtab:



# Copyright 2012-2018 Holger Levsen <holger@layer-acht.org>

# Copyright 2012-2019 Holger Levsen <holger@layer-acht.org>

#           2018      Mattia Rizzolo <mattia@debian.org>

# released under the GPLv=2
@@ -273,9 +273,9 @@ if [ "$2" != "" ] ; then 
					;;

				esac

				;;

		education-lang-da|education-lang-he|education-lang-ja|education-lang-no|education-lang-zh-tw)	install_packages "Debian Edu task" $2 $2-desktop

		education-lang-da|education-lang-he|education-lang-ja|education-lang-no|education-lang-zh-tw)	install_packages "Debian Edu task" $2 $2-desktop	# only in stretch, removed for buster

				;;

		education-lang-*)	install_packages "Debian Edu task" $2

		education-lang-*)	install_packages "Debian Edu task" $2	# only in stretch, removed for buster

				;;

		education*)	install_packages "Debian Edu task" $2

				;;

job-cfg/chroot-installation.yaml.py

+5 −2
Original line number Diff line number Diff line
@@ -115,8 +115,11 @@ def is_target_in_distro(distro, target): 
         # lxqt is only available since stretch

         elif distro in ('jessie') and target == 'lxqt':

             return False

         # education-lang-*, parl-desktop* and design-desktop* packages only exist since stretch

         elif distro in ('jessie') and (target[:15] == 'education-lang-' or target[:12] == 'parl-desktop' or target[:14] == 'design-desktop'):

         # education-lang-* packages only exist in stretch

         elif distro not in ('stretch') and target[:15] == 'education-lang-':

             return False

         # parl-desktop* and design-desktop* packages only exist since stretch

         elif distro in ('jessie') and (target[:12] == 'parl-desktop' or target[:14] == 'design-desktop'):

             return False

         # education-desktop-lxqt, education-primaryschool and education-video packages only exist since buster

         elif distro in ('jessie', 'stretch') and target in ('education-desktop-lxqt', 'education-primaryschool', 'education-video'):