diff options
Diffstat (limited to 'solenv/bin/modules/installer/ziplist.pm')
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 638d6716dd95..2d80061dd419 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -768,17 +768,12 @@ sub replace_variables_in_ziplist_variables { my ($blockref) = @_; - my $milestonevariable = $installer::globals::lastminor; - $milestonevariable =~ s/m//; - $milestonevariable =~ s/s/\./; - - my $localminor = $installer::globals::lastminor; + my $localminor = ""; if ( $installer::globals::minor ) { $localminor = $installer::globals::minor; } for ( my $i = 0; $i <= $#{$blockref}; $i++ ) { - if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; } - else { ${$blockref}[$i] =~ s/\{milestone\}//; } + ${$blockref}[$i] =~ s/\{milestone\}//; if ( $localminor ) { ${$blockref}[$i] =~ s/\{minor\}/$localminor/; } else { ${$blockref}[$i] =~ s/\{minor\}//; } if ( $installer::globals::buildid ) { ${$blockref}[$i] =~ s/\{buildid\}/$installer::globals::buildid/; } @@ -833,7 +828,6 @@ sub add_variables_to_allvariableshashref my $localminor = ""; if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; } - else { $localminor = $installer::globals::lastminor; } if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; } $variableshashref->{'PRODUCTMINOR'} = $localminor; |