Backed out changeset a67a0be7325e (bug 1127801) for test bustage.

This commit is contained in:
Ryan VanderMeulen
2015-04-07 11:50:10 -04:00
parent f08fd7d276
commit d65044a936
4 changed files with 9 additions and 13 deletions

View File

@@ -3,7 +3,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import print_function, unicode_literals
from mozbuild.base import MozbuildObject
import argparse
import os
@@ -27,9 +26,6 @@ def get_official_milestone(path):
"""
Returns the contents of the first line in `path` that starts with a digit.
"""
if path is None:
build = MozbuildObject.from_environment()
path = os.path.join(build.topsrcdir,'config','milestone.txt')
with open(path) as fp:
for line in fp:
@@ -52,10 +48,10 @@ def main(args):
parser = argparse.ArgumentParser()
parser.add_argument('--uaversion', default=False, action='store_true')
parser.add_argument('--symbolversion', default=False, action='store_true')
parser.add_argument('--topsrcdir', metavar='TOPSRCDIR', required=True)
options = parser.parse_args(args)
build = MozbuildObject.from_environment()
milestone_file = os.path.join(build.topsrcdir, 'config', 'milestone.txt')
milestone_file = os.path.join(options.topsrcdir, 'config', 'milestone.txt')
milestone = get_official_milestone(milestone_file)