diff options
| author | Andras Timar <atimar@suse.com> | 2012-05-21 16:25:49 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-05-21 21:09:32 +0200 |
| commit | 3d5c23f1cfeec3a9bc2f683e460e21afef728a6a (patch) | |
| tree | 320e52368202c5ee37cfe23d897ed41f222e60cc | |
| parent | c5766287c119f9af704538bf1f861b3f2b6c0863 (diff) | |
MSI: remove always true LaunchCondition
Change-Id: Ia2b63502dbd8b5e4e0ca7faa34e06df73f094a78
3 files changed, 0 insertions, 6 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf index 20f2a60dd195..e3f6f7fa8f53 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf @@ -1,4 +1,2 @@ [OOO_LAUNCH_1] en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system." -[OOO_LAUNCH_2] -en-US = "Please use the file setup.exe to start the installation." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 7c8ee157fb32..35d78694a664 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,4 +2,3 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition Privileged OOO_LAUNCH_1 -(VersionNT < 900) or (SETUP_USED=1) or Installed OOO_LAUNCH_2 diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 934802d51350..32195e1ba6b2 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -333,9 +333,6 @@ sub set_important_properties { my $onepropertyline = "ISPATCH" . "\t" . "1" . "\n"; push(@{$propertyfile}, $onepropertyline); - - $onepropertyline = "SETUP_USED" . "\t" . "0" . "\n"; - push(@{$propertyfile}, $onepropertyline); } if ( $installer::globals::languagepack ) |