Skip to content

make --check-conflicts report source of conflicts#1833

Merged
boegel merged 6 commits intoeasybuilders:developfrom
boegel:better_check_conflicts
Jul 7, 2016
Merged

make --check-conflicts report source of conflicts#1833
boegel merged 6 commits intoeasybuilders:developfrom
boegel:better_check_conflicts

Conversation

@boegel
Copy link
Copy Markdown
Member

@boegel boegel commented Jul 6, 2016

fix for #1816

@verdurin: how does this look?

$ eb --check-conflicts sympy-0.7.2-goolf-1.4.10-Python-2.7.3.eb Seaborn-0.6.0-goolf-1.4.10-Python-2.7.5.eb Python-2.7.6-goolf-1.4.10.eb
== temporary log file in case of crash /var/folders/xl/p7lmsxcs0bsg5_zv9y9lzk5c0000gn/T/eb-9gdqhJ/easybuild-3aUchF.log
Conflict between (dependencies of) easyconfigs: Python-2.7.3-goolf-1.4.10 vs Python-2.7.5-goolf-1.4.10 
    Python-2.7.3-goolf-1.4.10 as dep of: sympy-0.7.2-goolf-1.4.10-Python-2.7.3
    Python-2.7.5-goolf-1.4.10 as dep of: Seaborn-0.6.0-goolf-1.4.10-Python-2.7.5
Conflict between (dependencies of) easyconfigs: Python-2.7.3-goolf-1.4.10 vs Python-2.7.6-goolf-1.4.10 
    Python-2.7.3-goolf-1.4.10 as dep of: sympy-0.7.2-goolf-1.4.10-Python-2.7.3
Conflict between (dependencies of) easyconfigs: Python-2.7.5-goolf-1.4.10 vs Python-2.7.6-goolf-1.4.10 
    Python-2.7.5-goolf-1.4.10 as dep of: Seaborn-0.6.0-goolf-1.4.10-Python-2.7.5
Conflict between (dependencies of) easyconfigs: zlib-1.2.7-goolf-1.4.10 vs zlib-1.2.8-goolf-1.4.10 
    zlib-1.2.7-goolf-1.4.10 as dep of: Python-2.7.3-goolf-1.4.10, Python-2.7.6-goolf-1.4.10, sympy-0.7.2-goolf-1.4.10-Python-2.7.3
    zlib-1.2.8-goolf-1.4.10 as dep of: Python-2.7.5-goolf-1.4.10, SQLite-3.8.5-goolf-1.4.10, Seaborn-0.6.0-goolf-1.4.10-Python-2.7.5, Tcl-8.6.4-goolf-1.4.10
ERROR: One or more conflicts detected!

@boegel boegel added this to the v2.8.2 milestone Jul 6, 2016
@boegel
Copy link
Copy Markdown
Member Author

boegel commented Jul 6, 2016

@wpoely86 please review?

@boegel boegel mentioned this pull request Jul 6, 2016
Closed
wpoely86
wpoely86 reviewed Jul 7, 2016
View reviewed changes
Comment thread easybuild/tools/robot.py Outdated
for dep in build_deps + runtime_deps:
dep_of.setdefault(dep, set()).add(key)

def check_conflict((name, installver), dep1, dep2):
Copy link
Copy Markdown
Member

@wpoely86 wpoely86 Jul 7, 2016

Choose a reason for hiding this comment

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

doc the arguments

@verdurin
Copy link
Copy Markdown
Member

verdurin commented Jul 7, 2016

This looks good to me.

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Jul 7, 2016

Thanks for the feedback @verdurin, and for the review @wpoely86!

Going in...

@boegel boegel merged commit 1c7b011 into easybuilders:develop Jul 7, 2016
@boegel boegel deleted the better_check_conflicts branch July 7, 2016 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.8.2

Development

Successfully merging this pull request may close these issues.

3 participants

@boegel @verdurin @wpoely86