893723 - `mach bootstrap` fails when using binary Mac Mercurial package

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[A. Wilcox [:awilfox]]

Attachment: mozboot-mercurial-version-regex.patch

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9) AppleWebKit/537.48.3 (KHTML, like Gecko) Version/7.0 Safari/537.48.3

Steps to reproduce:

1. Install Mercurial binary package on Mac OS X.
2. Run `mach bootstrap`.


Actual results:

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

Full output at https://gist.github.com/CorgiDude/5999057


Expected results:

Your version of Mercurial (2.6) is sufficiently modern.

Comment 1

[Gregory Szorc [:gps]]

Comment on attachment 775587 [details] [diff] [review]
mozboot-mercurial-version-regex.patch

Review of attachment 775587 [details] [diff] [review]:
-----------------------------------------------------------------

I'll check this in for you.

Comment 2

[Gregory Szorc [:gps]]

https://hg.mozilla.org/mozilla-central/rev/91718a30c559

Thank you for the patch!

If you submit more patches, you'll want to read https://developer.mozilla.org/en-US/docs/Mercurial_FAQ#How_can_I_generate_a_patch_for_somebody_else_to_check-in_for_me.3F and configure your Mercurial client to properly generate patches.

This patch was missing some of the patch header lines and the commit message didn't follow the "Bug XXXXXX - Some short description" standard. Don't feel too bad - most everyone gets something wrong on his or her first patch. The important thing is you delivered a working patch and it's now integrated into the source tree. Congratulations!