Skip to content

Provide name of conflicting repository #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
berenddeboer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide name of conflicting repository #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/tools/iron/client/application/tasks/list/iron_list_task.e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ feature -- Execute
if not l_only_conflict or else l_has_conflict then
print (p.item.human_identifier)
if l_has_conflict then
print (" [Conflict!] ")
print (" [conflict!] ")
end
print_new_line
if args.verbose then
Expand Down Expand Up @@ -137,8 +137,8 @@ feature -- Execute
if a_iron.installation_api.is_package_installed (p.item) then
print (" [installed] ")
end
if l_has_conflict then
print (" [conflict!] ")
if l_has_conflict and then attached l_package_names.item (p.item.identifier) as l_earlier_package then
Copy link
Member

@jocelyn jocelyn Sep 9, 2018 •
edited by berenddeboer
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do

if l_has_conflict then
    if attached l_package_names.item (p.item.identifier) as l_earlier_package then
        print (" [ignoring this package as it is also listed in the " + l_earlier_package.repository.location_string + " repository!] ")
    else
        print (" [Conflict!] ")
    end

otherwise, the conflict may not be reported... even if it is likely that l_earlier_package is set.

print (" [ignoring this package as it is also listed in the " + l_earlier_package.repository.location_string + " repository!] ")
end
print_new_line
if args.verbose then
Expand Down