From 0823a615b86c5629ff5a7354c75603e23966f0bb Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 9 Apr 2018 09:33:20 +0100 Subject: tdf#108580 related: Check for SP level of the minimal supported OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we support Win7 SP1 and later; so let installer fail on lower SP levels. Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408 Reviewed-on: https://gerrit.libreoffice.org/52619 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea) Reviewed-on: https://gerrit.libreoffice.org/52632 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 158f6e5489d8167299deb53fde433e835019d10a) --- solenv/bin/modules/installer/windows/property.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 61b18ac29a56..a0ad3698aa10 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -419,8 +419,9 @@ sub update_property_table my $productname = get_productname_for_property_table($language, $allvariables); my $productversion = get_productversion_for_property_table(); my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables); - my $windowsminversiontext = "Windows 7"; + my $windowsminversiontext = "Windows 7 SP1"; my $windowsminversionnumber = "601"; + my $windowsminspnumber = "1"; # Updating the values @@ -436,6 +437,7 @@ sub update_property_table ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/; ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/; ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/; + ${$propertyfile}[$i] =~ s/\bWINDOWSMINSPNUMBERTEMPLATE\b/$windowsminspnumber/; if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 1; } } -- cgit