On Tue, Jun 06, 2017 at 03:26:41PM +0000, Holger Levsen wrote: > IOW: the content is the same except for the version number. Thanks for pointing me to diffoscope. The problem 'fixed version list' might be solved like stated below; please test: --- a/debian-edu-install.postinst 2017-05-30 23:09:06.000000000 +0200 +++ b/debian-edu-install.postinst 2017-06-07 10:05:41.584716847 +0200 @@ -115,55 +115,13 @@ # Source the debconf confmodule to ensure that the templates are loaded. . /usr/share/debconf/confmodule -oldversions="sarge \ - terra_alpha \ - terra_test01 terra_test02 terra_test03 terra_test04 \ - terra_pre01 terra_pre02 \ - terra_rc1 terra_rc2 terra_rc3 terra_rc4 terra_rc5" - # get the current version new_version="$(cat /usr/lib/debian-edu-install/version)" if [ -f $debian_edu_config ] ; then - ( # Subshell to avoid importing the variables into the entire script - VERSION="" - . $debian_edu_config - - # FIXME: the following code doesn't seem to make any sense and should - # be cleaned up post jessie release. It's seems way simpler (and - # easier to maintain) to just rewrite /etc/debian-edu/config on - # upgrades like it done on installation in pre-pkgsel (from this - # package). - - # clean up missing version caused by bug introduced in version - # 1.810 and fixed in version 1.813. - if [ -z "$VERSION" ] ; then - sed -i $debian_edu_config -e \ - "s/^VERSION=.*$/VERSION=\"$new_version\"/" - fi - - # Need to list versions with space here, to avoid unwanted - # word splitting - for i in $oldversions '3.0r0 terra' '3.0r1 terra' '4.0r0 luna alpha1' \ - '5.0r0+edu0 alpha' '5.0.0+edu0 alpha' '5.0.1+edu0 alpha' \ - '5.0.2+edu0 alpha' '5.0.3+edu0 alpha' '5.0.3+edu0 rc1' \ - '5.0.4+edu0 rc2' '5.0.4+edu0' '5.0.6+edu1' '6.0.0+edu0 alpha' \ - '6.0.3+edu0 beta1' '6.0.3+edu0 beta2' '6.0.3+edu0 beta3' \ - '6.0.4+edu0 beta3' '6.0.4+edu0 rc1' '6.0.4+edu0 rc2' \ - '6.0.4+edu0 rc3' '6.0.4+edu+r0' '6.0.7+edu+r1' \ - '7.0.0+edu+alpha0' '7.0.0+edu+alpha2' '7.0.0+edu+alpha3' \ - '7.1+edu0~a3' '7.1+edu0~b0' '7.1+edu0~b1' '7.1+edu0~b2' \ - '7.1+edu0' '8.0.0+edu+alpha0' '8.0+edu+alpha0' \ - '8.0+edu0~alpha0' '8.0+edu0~alpha1' '8.0+edu0~alpha2' \ - '8.0+edu0~beta1' '8+edu0' '9+edu0~alpha0' '9+edu0~a0' - - do - if [ "$VERSION" = "$i" ] ; then - sed -i $debian_edu_config -e \ - "s/^VERSION=.*$/VERSION=\"$new_version\"/" - fi - done - ) + . $debian_edu_config + sed -i $debian_edu_config -e \ + "s/^VERSION=.*$/VERSION=\"$new_version\"/" fi # handle preseeding to enable or disable firstboot script, as appropriate. Wolfgang
Attachment:
signature.asc
Description: PGP signature