diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2007-07-06 11:25:37 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2007-07-06 11:25:37 +0000 |
commit | cbf5116fd2bdc9883002711686726b0ee299163d (patch) | |
tree | 4de8751677a3e095b17656bec8eed78ed5b88bc9 /solenv/bin/modules/installer/windows/feature.pm | |
parent | e8331182844b723a43db13cab7244cba54994a13 (diff) |
INTEGRATION: CWS c09tosrc (1.16.86); FILE MERGED
2007/06/21 16:25:11 is 1.16.86.1: #144951# c09 to src680 for installation tasks
Diffstat (limited to 'solenv/bin/modules/installer/windows/feature.pm')
-rw-r--r-- | solenv/bin/modules/installer/windows/feature.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index 178a8e40bbcf..7a75403d1cce 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -4,9 +4,9 @@ # # $RCSfile: feature.pm,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: rt $ $Date: 2007-04-02 12:23:12 $ +# last change: $Author: rt $ $Date: 2007-07-06 12:25:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -158,6 +158,10 @@ sub get_feature_level if ( $onefeature->{'Name'} =~ /java/i || $onefeature->{'Name'} =~ /adabas/i ) { $level = $level + 40; } + # if FeatureLevel is defined in scp, this will be used + + if ( $onefeature->{'FeatureLevel'} ) { $level = $onefeature->{'FeatureLevel'}; } + return $level } |