Pip can now accept vcs or tarball as name. Prevented adding mirrors when name is vcs.

**Summary**:

There was a bug in the previous commit; pip module would add --use-mirrors options to a source package when state is absent. The bug is resolved in this commit by checking ``not is_package`` in the if branch.

Furthermore, in order to support non-vcs source name like tarballs, we must not add -e option to the arg list. Given this circumstance, this commit have is_tar and is_vcs and the latter is checked to add -e option. Since mirrors do not make sense with vcs or tarball source, this commit will not add --use-mirrors (default to True) as always.
pull/2875/head
Yeukhon Wong 12 years ago
parent 5946a25c91
commit 08a486fe31

@ -95,7 +95,7 @@ examples:
- code: "pip: name=flask version=0.8" - code: "pip: name=flask version=0.8"
description: Install I(flask) python package on version 0.8. description: Install I(flask) python package on version 0.8.
- code: "pip: name='svn+http://myrepo/svn/MyApp#egg=MyApp'" - code: "pip: name='svn+http://myrepo/svn/MyApp#egg=MyApp'"
description: Install I(MyApp) using one of the remote protocols (bzr,hg,git,svn) C(pip) supports. You do not have to supply '-e' option in extra_args. description: Install I(MyApp) using one of the remote protocols (bzr+,hg+,git+,svn+) or tarballs (zip, gz, bz2) C(pip) supports. You do not have to supply '-e' option in extra_args. For these source names, C(use_mirrors) is ignored and not applicable.
- code: "pip: name=flask virtualenv=/my_app/venv" - code: "pip: name=flask virtualenv=/my_app/venv"
description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), inheriting none of the globally installed modules" description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), inheriting none of the globally installed modules"
- code: "pip: name=flask virtualenv=/my_app/venv virtualenv_site_packages=yes" - code: "pip: name=flask virtualenv=/my_app/venv virtualenv_site_packages=yes"
@ -184,16 +184,21 @@ def main():
if state == 'latest' and version is not None: if state == 'latest' and version is not None:
module.fail_json(msg='version is incompatible with state=latest') module.fail_json(msg='version is incompatible with state=latest')
# before we move on, check if name is #egg (remote repository/package) # pip can accept a path to a local project or a VCS url beginning
# if it is, mark it as package so we can skip --use-mirrors and skip # with svn+, git+, hg+, or bz+ and these sources usually do not qualify
# version arg checks # --use-mirrors. Furthermore, the -e option is applied only when
is_package = False # source is a VCS url. Therefore, we will have branch cases for each
if '#egg=' in name: # type of sources.
is_package = True #
else: # is_vcs includes those begin with svn+, git+, hg+ or bzr+
# we have to handle the case when version is required for non-remote package # is_tar ends with .zip, .tar.gz, or .tar.bz2
if name and '=' in name: is_vcs = False
module.fail_json(msg='version must be specified in the version parameter') is_tar = False
if name.endswith('.tar.gz') or name.endswith('.tar.bz2') or name.endswith('.zip'):
is_tar = True
elif name.startswith('svn+') or name.startswith('git+') or \
name.startswith('hg+') or name.startswith('bzr+'):
is_vcs = True
err = '' err = ''
out = '' out = ''
@ -221,10 +226,9 @@ def main():
cmd = '%s %s' % (pip, state_map[state]) cmd = '%s %s' % (pip, state_map[state])
# If is_package is True, we must not add --use-mirrors option.
# Also, if -e option is not added by the user via extra_args, # If is_vcs=True, we must add -e option (we assume users won't add that to extra_args).
# we must add -e ourselves. if is_vcs:
if is_package:
args_list = [] # used if extra_args is not used at all args_list = [] # used if extra_args is not used at all
if extra_args: if extra_args:
args_list = extra_args.split(' ') args_list = extra_args.split(' ')
@ -232,7 +236,9 @@ def main():
args_list.append('-e') args_list.append('-e')
# Ok, we will reconstruct the option string # Ok, we will reconstruct the option string
extra_args = ' '.join(args_list) extra_args = ' '.join(args_list)
if not is_package or state != 'absent' and use_mirrors: # for tarball or vcs source, applying --use-mirrors doesn't really make sense
is_package = is_vcs or is_tar # just a shortcut for bool
if not is_package and state != 'absent' and use_mirrors:
cmd += ' --use-mirrors' cmd += ' --use-mirrors'
if extra_args: if extra_args:
cmd += ' %s' % extra_args cmd += ' %s' % extra_args

Loading…
Cancel
Save