Skip to content

Commit

Permalink
A dot and an if away from salvation
Browse files Browse the repository at this point in the history
  • Loading branch information
vphilippon committed Nov 16, 2017
1 parent 73ba65f commit f19ee42
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions pipenv/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,17 +529,18 @@ def resolve_deps(deps, which, which_pip, project, sources=None, verbose=False, p
resolved_tree = actually_resolve_reps(deps, index_lookup, markers_lookup, project, sources, verbose, clear, pre)
except RuntimeError:
# Don't exit here, like usual.
pass
resolved_tree = None

# Second (last-resort) attempt:
with HackedPythonVersion(python_version=''.join([str(s) for s in sys.version_info[:3]]), python_path=backup_python_path):
if resolved_tree is None:
with HackedPythonVersion(python_version='.'.join([str(s) for s in sys.version_info[:3]]), python_path=backup_python_path):

try:
# Attempt to resolve again, with different Python version information,
# particularly for particularly particular packages.
resolved_tree = actually_resolve_reps(deps, index_lookup, markers_lookup, project, sources, verbose, clear, pre)
except RuntimeError:
sys.exit(1)
try:
# Attempt to resolve again, with different Python version information,
# particularly for particularly particular packages.
resolved_tree = actually_resolve_reps(deps, index_lookup, markers_lookup, project, sources, verbose, clear, pre)
except RuntimeError:
sys.exit(1)



Expand Down

0 comments on commit f19ee42

Please sign in to comment.