diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 10:30:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 10:30:52 +0000 |
| commit | cbff0d632e298da55505f865969ac2dcfa4d4e87 (patch) | |
| tree | 9fd5630cedac1156b40aa4374f50486787bbafb7 /solenv/bin | |
| parent | 3dd3fc82691fa887d51d07f0a4c30caecd210b89 (diff) | |
INTEGRATION: CWS native185_DEV300 (1.18.38); FILE MERGED
2008/08/12 16:07:57 is 1.18.38.1: #i92713# userland installation with prepared database
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/xpdinstaller.pm | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm index 16da7510d397..05bb640b9540 100644 --- a/solenv/bin/modules/installer/xpdinstaller.pm +++ b/solenv/bin/modules/installer/xpdinstaller.pm @@ -8,7 +8,7 @@ # # $RCSfile: xpdinstaller.pm,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # # This file is part of OpenOffice.org. # @@ -272,6 +272,24 @@ sub get_showinuserinstall_value } ################################################### +# Asking module for showinuserinstall entry +# scp style: USERINSTALLONLY +################################################### + +sub get_userinstallonly_value +{ + my ( $module ) = @_; + + my $value = "false"; + + my $styles = ""; + if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } + if ( $styles =~ /\bUSERINSTALLONLY\b/ ) { $value = "true"; } + + return $value; +} + +################################################### # Asking module for dontuninstall entry # scp style: DONTUNINSTALL ################################################### @@ -1088,6 +1106,10 @@ sub get_file_content $line = get_tag_line($doubleindent, "showinuserinstall", $value); push(@xpdfile, $line); + $value = get_userinstallonly_value($module); + $line = get_tag_line($doubleindent, "showinuserinstallonly", $value); + push(@xpdfile, $line); + $value = get_dontuninstall_value($module); $line = get_tag_line($doubleindent, "dontuninstall", $value); push(@xpdfile, $line); |