Skip to content

Commit 94c9658

Browse files
authored
Merge pull request #6335 from pypa/fix-6326
fix: correct printing of errors
2 parents f15af7e + 69d2331 commit 94c9658

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pipenv/resolver.py

-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ def main(argv=None):
447447
os.environ["PYTHONUNBUFFERED"] = "1"
448448
parsed = handle_parsed_args(parsed)
449449
if not parsed.verbose:
450-
print(parsed.verbose)
451450
logging.getLogger("pipenv").setLevel(logging.WARN)
452451
_main(
453452
parsed.pre,

pipenv/utils/resolver.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ def resolve(self):
457457
try:
458458
results = resolver.resolve(self.constraints, check_supported_wheels=False)
459459
except InstallationError as e:
460-
raise ResolutionFailure(message=str(e))
460+
raise ResolutionFailure(message=e)
461461
else:
462462
self.results = set(results.all_requirements)
463463
self.resolved_tree.update(self.results)
@@ -765,9 +765,9 @@ def resolve(cmd, st, project):
765765
out = c.stdout.read()
766766
if returncode != 0:
767767
st.console.print(environments.PIPENV_SPINNER_FAIL_TEXT.format("Locking Failed!"))
768-
err.print(out.strip())
768+
# err.print(out.strip())
769769
if not is_verbose:
770-
err.print(err)
770+
err.print(errors)
771771
raise RuntimeError("Failed to lock Pipfile.lock!")
772772
if is_verbose:
773773
err.print(out.strip())

0 commit comments

Comments
 (0)