Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
Bug 766706 - mozharness virtualenv install method should be able to s…
Browse files Browse the repository at this point in the history
…pecify --find-links;r=aki
  • Loading branch information
Jeff Hammel committed Jun 21, 2012
1 parent 5c05732 commit 1e323fb
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions mozharness/base/python.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
"dest": "pypi_url", "dest": "pypi_url",
"help": "Base URL of Python Package Index (default http://pypi.python.org/simple/)" "help": "Base URL of Python Package Index (default http://pypi.python.org/simple/)"
} }
],
[["--find-links"],
{"action": "extend",
"dest": "find_links",
"help": "URL to look for packages at"
}
]] ]]


class VirtualenvMixin(object): class VirtualenvMixin(object):
Expand Down Expand Up @@ -163,6 +169,11 @@ def install_module(self, module, module_url=None, install_method=None):
command = [easy_install] command = [easy_install]
else: else:
self.fatal("install_module() doesn't understand an install_method of %s!" % install_method) self.fatal("install_module() doesn't understand an install_method of %s!" % install_method)

# Add --find-links pages to look at
for link in c.get('find_links', []):
command.extend(["--find-links", link])

# Allow for errors while building modules, but require a # Allow for errors while building modules, but require a
# return status of 0. # return status of 0.
if self.run_command(command + [module_url], if self.run_command(command + [module_url],
Expand Down

0 comments on commit 1e323fb

Please sign in to comment.