summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-21 21:41:23 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-21 21:41:23 +0100
commitc9fc6f49233c267069f93dd20e393f5cc28b1ee7 (patch)
treed071973cbfdfa507f4ae74a21d6ff887e98fe71c /python
parent12640bf26e8a47293815670b03eec92a2965fcb6 (diff)
downloaduxp-c9fc6f49233c267069f93dd20e393f5cc28b1ee7.tar.gz
Pick up major+minor milestone version from GRE milestone file.
Diffstat (limited to 'python')
-rw-r--r--python/mozbuild/mozbuild/milestone.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/python/mozbuild/mozbuild/milestone.py b/python/mozbuild/mozbuild/milestone.py
index c2aa78fcd9..3ef55d540d 100644
--- a/python/mozbuild/mozbuild/milestone.py
+++ b/python/mozbuild/mozbuild/milestone.py
@@ -43,6 +43,12 @@ def get_milestone_major(milestone):
return milestone.split('.')[0]
+def get_milestone_minor(milestone):
+ """
+ Returns the minor (second) part of the milestone.
+ """
+
+ return milestone.split('.')[1]
def main(args):
parser = argparse.ArgumentParser()
@@ -56,9 +62,9 @@ def main(args):
milestone = get_official_milestone(milestone_file)
if options.uaversion:
- # Only expose the major milestone in the UA string, hide the patch
- # level (bugs 572659 and 870868).
- uaversion = "%s.0" % (get_milestone_major(milestone),)
+ # Only expose the major+minor milestone in the UA string.
+ uaversion = "%s.%s" % (get_milestone_major(milestone),
+ get_milestone_minor(milestone))
print(uaversion)
elif options.symbolversion: