Bug 870868 - Freeze the second number of the UA Gecko version at zero. r=glandium

This commit is contained in:
Dão Gottwald 2013-05-13 13:31:50 +02:00
parent 09083aa9d2
commit 9ae00fda47
2 changed files with 6 additions and 8 deletions

View File

@ -71,10 +71,9 @@ if (defined(@TEMPLATE_FILE)) {
}
}
} elsif(defined($opt_uaversion)) {
my $uaversion = Moz::Milestone::getMilestoneMajor($milestone) . "." .
Moz::Milestone::getMilestoneMinor($milestone);
# strip off trailing pre-release indicators
$uaversion =~ s/[a-z]+\d*$//;
# Only expose the major milestone in the UA string, hide the patch level
# (bugs 572659 and 870868).
my $uaversion = Moz::Milestone::getMilestoneMajor($milestone) . ".0";
print "$uaversion\n";
} else {
print "$milestone\n";

View File

@ -71,10 +71,9 @@ if (defined(@TEMPLATE_FILE)) {
}
}
} elsif(defined($opt_uaversion)) {
my $uaversion = Moz::Milestone::getMilestoneMajor($milestone) . "." .
Moz::Milestone::getMilestoneMinor($milestone);
# strip off trailing pre-release indicators
$uaversion =~ s/[a-z]+\d*$//;
# Only expose the major milestone in the UA string, hide the patch level
# (bugs 572659 and 870868).
my $uaversion = Moz::Milestone::getMilestoneMajor($milestone) . ".0";
print "$uaversion\n";
} else {
print "$milestone\n";