Skip to content

Commit

Permalink
Merge pull request #6335 from pypa/fix-6326
Browse files Browse the repository at this point in the history
fix: correct printing of errors
  • Loading branch information
oz123 authored Jan 14, 2025
2 parents f15af7e + 69d2331 commit 94c9658
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion pipenv/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ def main(argv=None):
os.environ["PYTHONUNBUFFERED"] = "1"
parsed = handle_parsed_args(parsed)
if not parsed.verbose:
print(parsed.verbose)
logging.getLogger("pipenv").setLevel(logging.WARN)
_main(
parsed.pre,
Expand Down
6 changes: 3 additions & 3 deletions pipenv/utils/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ def resolve(self):
try:
results = resolver.resolve(self.constraints, check_supported_wheels=False)
except InstallationError as e:
raise ResolutionFailure(message=str(e))
raise ResolutionFailure(message=e)
else:
self.results = set(results.all_requirements)
self.resolved_tree.update(self.results)
Expand Down Expand Up @@ -765,9 +765,9 @@ def resolve(cmd, st, project):
out = c.stdout.read()
if returncode != 0:
st.console.print(environments.PIPENV_SPINNER_FAIL_TEXT.format("Locking Failed!"))
err.print(out.strip())
# err.print(out.strip())
if not is_verbose:
err.print(err)
err.print(errors)
raise RuntimeError("Failed to lock Pipfile.lock!")
if is_verbose:
err.print(out.strip())
Expand Down

0 comments on commit 94c9658

Please sign in to comment.