Skip to content

Commit

Permalink
Added dependency paths for resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
techbech committed Oct 24, 2023
1 parent c1710ff commit 2c949a2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions NEWS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ of every change, see the Git log.

Latest
------
* Patch: Added dependency paths for resolve conflicts.
* Patch: Fix ``--no_resolve`` option.
* Minor: Change output so that the resolve path is printed instead of the
default resolve path.
Expand Down
5 changes: 3 additions & 2 deletions src/wurf/dependency_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ def __skip_dependency(self, dependency):
raise WurfError(
f"Adding {dependency.name} in {current}:\n"
f"First added by {added_by}:\n"
f"SHA1 mismatch:\n{dependency}\n"
f"the previous definition was:\n{seen_dependency}"
f"SHA1 mismatch\n"
f"As seen in {current}\n:{dependency}\n"
f"the previous definition from {added_by} was:\n{seen_dependency}"
)

# This dependency is already in the seen_dependencies
Expand Down

0 comments on commit 2c949a2

Please sign in to comment.