From 8e2f7377ff6858ab5510baaa71c2bc100bb9e473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 13 May 2013 13:31:50 +0200
Subject: [PATCH] Bug 870868 - Freeze the second number of the UA Gecko version
 at zero. r=glandium

---
 config/milestone.pl        | 7 +++----
 js/src/config/milestone.pl | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/config/milestone.pl b/config/milestone.pl
index db3f6dd36ba1..fa9837ffdd06 100755
--- a/config/milestone.pl
+++ b/config/milestone.pl
@@ -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";
diff --git a/js/src/config/milestone.pl b/js/src/config/milestone.pl
index db3f6dd36ba1..fa9837ffdd06 100644
--- a/js/src/config/milestone.pl
+++ b/js/src/config/milestone.pl
@@ -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";