diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-09 09:33:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-17 13:18:43 +0200 |
| commit | 0823a615b86c5629ff5a7354c75603e23966f0bb (patch) | |
| tree | c5f84521cfbe5c8f151f8d4df668a260bc4b2994 /solenv | |
| parent | 0578bbb22b7def7cb52e497751d3b1822020bdc1 (diff) | |
tdf#108580 related: Check for SP level of the minimal supported OS
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 <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea)
Reviewed-on: https://gerrit.libreoffice.org/52632
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 158f6e5489d8167299deb53fde433e835019d10a)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/property.pm | 4 |
1 files changed, 3 insertions, 1 deletions
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; } } |