Last active
December 19, 2015 18:29
-
-
Save awilfox/5999057 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
awilcox on ind-wkst040 mozilla-central: ./mach bootstrap [s005 Mon 15 6:22] | |
Looks like you have Homebrew installed. We will install all required packages via Homebrew. | |
Error running mach: | |
['bootstrap'] | |
The error occurred in code that was called by the mach command. This is either | |
a bug in the called code itself or in the way that mach is calling it. | |
You should consider filing a bug for this issue. | |
If filing a bug, please include the full output of mach, including this error | |
message. | |
The details of the failure are as follows: | |
ValueError: invalid version number '2.6+20130507' | |
File "/Users/awilcox/Code/moz/mozilla-central/python/mozboot/mozboot/mach_commands.py", line 24, in bootstrap | |
bootstrapper.bootstrap() | |
File "/Users/awilcox/Code/moz/mozilla-central/python/mozboot/mozboot/bootstrap.py", line 79, in bootstrap | |
instance.ensure_mercurial_modern() | |
File "/Users/awilcox/Code/moz/mozilla-central/python/mozboot/mozboot/base.py", line 200, in ensure_mercurial_modern | |
installed, modern, version = self.is_mercurial_modern() | |
File "/Users/awilcox/Code/moz/mozilla-central/python/mozboot/mozboot/base.py", line 195, in is_mercurial_modern | |
our = StrictVersion(match.group(1)) | |
File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/version.py", line 40, in __init__ | |
File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/version.py", line 107, in parse | |
awilcox on ind-wkst040 mozilla-central: vi python/mozboot/mozboot/base.py [s005 Mon 15 6:22] | |
awilcox on ind-wkst040 mozilla-central: ./mach bootstrap [s005 Mon 15 6:23] | |
Looks like you have Homebrew installed. We will install all required packages via Homebrew. | |
Your version of Mercurial (2.6) is sufficiently modern. | |
Your version of Python (2.7.5) is new enough. | |
Your system should be ready to build Firefox! If you have not already, | |
obtain a copy of the source code by running: | |
hg clone https://hg.mozilla.org/mozilla-central | |
Or, if you prefer Git: | |
git clone git://github.com/mozilla/mozilla-central.git | |
awilcox on ind-wkst040 mozilla-central: hg --version [s005 Mon 15 6:38] | |
Mercurial Distributed SCM (version 2.6+20130507) | |
(see http://mercurial.selenic.com for more information) | |
Copyright (C) 2005-2012 Matt Mackall and others | |
This is free software; see the source for copying conditions. There is NO | |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From: Andrew Wilcox <[email protected]> | |
mozboot: Ignore trailing '+' in Mercurial version string | |
diff --git a/python/mozboot/mozboot/base.py b/python/mozboot/mozboot/base.py | |
--- a/python/mozboot/mozboot/base.py | |
+++ b/python/mozboot/mozboot/base.py | |
@@ -182,17 +182,17 @@ class BaseBootstrapper(object): | |
def is_mercurial_modern(self): | |
hg = self.which('hg') | |
if not hg: | |
print(NO_MERCURIAL) | |
return False, False, None | |
info = self.check_output([hg, '--version']).splitlines()[0] | |
- match = re.search('version ([^\)]+)', info) | |
+ match = re.search('version ([^\+\)]+)', info) | |
if not match: | |
print('ERROR: Unable to identify Mercurial version.') | |
return True, False, None | |
our = StrictVersion(match.group(1)) | |
return True, our >= MODERN_MERCURIAL_VERSION, our |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment