diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 11:23:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 11:23:52 +0000 |
| commit | 52e215e78c48743dbe5eb708150d7099701282f2 (patch) | |
| tree | af67fe3de7f895668499397e5ada406e6968565e /solenv/bin/modules/installer/windows/upgrade.pm | |
| parent | a188c290b414da9471c4161a97dc0542fa814fc9 (diff) | |
INTEGRATION: CWS native80 (1.10.6); FILE MERGED
2007/03/06 13:46:15 is 1.10.6.2: #145483# no more orca errors
2007/03/05 16:50:54 is 1.10.6.1: #145483# removing errors in msi databases
Diffstat (limited to 'solenv/bin/modules/installer/windows/upgrade.pm')
| -rw-r--r-- | solenv/bin/modules/installer/windows/upgrade.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm index 65bc2e26bcf5..a432ebc3544a 100644 --- a/solenv/bin/modules/installer/windows/upgrade.pm +++ b/solenv/bin/modules/installer/windows/upgrade.pm @@ -4,9 +4,9 @@ # # $RCSfile: upgrade.pm,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2007-02-19 13:50:59 $ +# last change: $Author: rt $ $Date: 2007-04-02 12:23:52 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,7 @@ sub create_upgrade_table # fix for problematic OOo 1.9 versions my $include_ooo_fix = 0; my $ooomaxnew = ""; - if ($installer::globals::product =~ /OpenOffice/i ) + if (($installer::globals::product =~ /OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i ))) { $include_ooo_fix = 1; $ooomaxnew = "34.0.0"; @@ -76,7 +76,7 @@ sub create_upgrade_table if ( $include_ooo_fix ) { - $newline = $installer::globals::upgradecode . "\t" . "35.0.0" . "\t" . "36.0.0" . "\t" . "\t" . "1" . "\t" . "\t" . "OLDPRODUCTS" . "\n"; + $newline = $installer::globals::upgradecode . "\t" . "35.0.0" . "\t" . "36.0.0" . "\t" . "\t" . "1" . "\t" . "\t" . "OLDPRODUCTS2" . "\n"; push(@upgradetable, $newline); } |