diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2012-07-19 10:55:35 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-28 13:06:52 +0200 |
| commit | 52e61794edd630261b34cd5a20cccc220231877c (patch) | |
| tree | e826f55d65814e9896f10779981457ffeca434e4 /solenv/bin | |
| parent | 997bfce2df6648160ccec41e0a4e440d8711b429 (diff) | |
set MSP name
Change-Id: Ib1120ea82a8e3e9d15d524ff413a1342dec3dad0
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/windows/msp.pm | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index a5e9ad274f7d..e144c45dc578 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -311,41 +311,7 @@ sub set_mspfilename { my ($allvariables, $mspdir, $languagesarrayref) = @_; - my $databasename = $allvariables->{'PRODUCTNAME'}; - $databasename = lc($databasename); - $databasename =~ s/\.//g; - $databasename =~ s/\-//g; - $databasename =~ s/\s//g; - - if ( $allvariables->{'MSPPRODUCTVERSION'} ) { $databasename = $databasename . $allvariables->{'MSPPRODUCTVERSION'}; } - - # possibility to overwrite the name with variable DATABASENAME - # if ( $allvariables->{'DATABASENAME'} ) { $databasename = $allvariables->{'DATABASENAME'}; } - - # Adding patch info to database name - # if ( $installer::globals::buildid ) { $databasename = $databasename . "_" . $installer::globals::buildid; } - - # if ( $allvariables->{'VENDORPATCHVERSION'} ) { $databasename = $databasename . "_" . $allvariables->{'VENDORPATCHVERSION'}; } - - - if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 )) - { - my $windowspatchlevel = 0; - if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; } - $databasename = $databasename . "_servicepack_" . $windowspatchlevel; - my $languagestring = create_langstring($languagesarrayref); - $databasename = $databasename . $languagestring; - } - else - { - my $hotfixaddon = "hotfix_"; - $hotfixaddon = $hotfixaddon . $installer::globals::buildid; - my $cwsname = ""; - if ( $allvariables->{'OVERWRITE_CWSNAME'} ) { $hotfixaddon = $allvariables->{'OVERWRITE_CWSNAME'}; } - $databasename = $databasename . "_" . $hotfixaddon; - } - - $databasename = $databasename . ".msp"; + my $databasename = $allvariables->{'PRODUCTNAME'} . "-PTF-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp"; my $fullmspname = $mspdir . $installer::globals::separator . $databasename; |