Bug 870868 - Freeze the second number of the UA Gecko version at zero. r=glandium a=lsblakk
authorDão Gottwald <dao@mozilla.com>
Tue, 14 May 2013 15:09:58 +0200
changeset 142643 31ec92d3979def6c38f1dcf44671e4edaf504512
parent 142642 5e5223252558ba32e3652764ae7fc22b2697c885
child 142644 154a0b681893290df2f9c661a1a3025576cf3370
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, lsblakk
bugs870868
milestone23.0a2
Bug 870868 - Freeze the second number of the UA Gecko version at zero. r=glandium a=lsblakk
config/milestone.pl
js/src/config/milestone.pl
--- a/config/milestone.pl
+++ b/config/milestone.pl
@@ -66,20 +66,19 @@ if (defined(@TEMPLATE_FILE)) {
 
       Moz::Milestone::build_file($TFILE,$BUILT_FILE);
 
     } else {
       warn("$0:  No such file $TFILE!\n");
     }
   }
 } 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";
 }
 
 sub usage() {
   print <<END
 `milestone.pl [--topsrcdir TOPSRCDIR] [--objdir OBJDIR] [--srcdir SRCDIR] --template [file list] --uaversion`  # will build file list from .tmpl files
--- a/js/src/config/milestone.pl
+++ b/js/src/config/milestone.pl
@@ -66,20 +66,19 @@ if (defined(@TEMPLATE_FILE)) {
 
       Moz::Milestone::build_file($TFILE,$BUILT_FILE);
 
     } else {
       warn("$0:  No such file $TFILE!\n");
     }
   }
 } 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";
 }
 
 sub usage() {
   print <<END
 `milestone.pl [--topsrcdir TOPSRCDIR] [--objdir OBJDIR] [--srcdir SRCDIR] --template [file list] --uaversion`  # will build file list from .tmpl files