885572 - upgrade_mercurial() is expecting an argument while child class method does not

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Yeuk Hon Wong]

In the default revision b7175c5829b5, upgrade_mercurial() method in the base class is expecting an argument. But child implementations do not. 

https://hg.mozilla.org/mozilla-central/diff/b7175c5829b5/python/mozboot/mozboot/base.py#l1.163



Reading package lists... Done
Traceback (most recent call last):
File "bootstrap.py", line 142, in <module>
sys.exit(main(sys.argv))
File "bootstrap.py", line 133, in main
dasboot.bootstrap()
File "/tmp/tmpOqZKMI/mozboot/bootstrap.py", line 79, in bootstrap
from mozboot.bootstrap import Bootstrapper
File "/tmp/tmpOqZKMI/mozboot/base.py", line 208, in ensure_mercurial_modern
TypeError: upgrade_mercurial() takes exactly 1 argument (2 given)
vagrant@precise64:~$ vim /tmp/tmpOqZKMI/mozboot/base.py


The only one that actually accept this arugment is in osx.py
https://hg.mozilla.org/mozilla-central/file/d234e90f4d17/python/mozboot/mozboot/osx.py#l315

I think we should remove the argument since none of them are using. I imagine the rest os will fail because of this bug if they follow the same code path.

Comment 1

[Gregory Szorc [:gps]]

Attachment: Fix upgrade_mercurial() in bootstrapper

Looking for a quick rubber stamp. The argument is used by the base
class, so we can't just remove it. We could dynamically send the
argument or something, but that is slightly more involved.

Comment 2

[Gregory Szorc [:gps]]

https://hg.mozilla.org/mozilla-central/rev/e872cb70e719