diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-22 08:59:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-22 08:59:14 +0100 |
| commit | eaac0616072e22313ea96eb6e68d9a8f28f70dc7 (patch) | |
| tree | c967d49511cb2696bdca86affac1e6ee7b374a3b /python | |
| parent | d77729916b4b9c2b67abd41181336c2cbb1da968 (diff) | |
| parent | 6f96569b4499be07c210ca6c38739bbbc7ebdee7 (diff) | |
| download | UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.gz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.lz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.xz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.zip | |
Merge branch 'ported-moebius'
Diffstat (limited to 'python')
| -rw-r--r-- | python/mozbuild/mozbuild/milestone.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/python/mozbuild/mozbuild/milestone.py b/python/mozbuild/mozbuild/milestone.py index c2aa78fcd..3ef55d540 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: |