diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-07 11:34:23 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-07 11:34:33 +0000 |
| commit | 83bcd8426e223223177928bd685eb247ba02abcf (patch) | |
| tree | a5c213d9bc124f0a359cf02d372be1920c1389ef | |
| parent | 51954ec5a6eb21a08a28410a863fbfeee7bf620b (diff) | |
| download | import-83bcd8426e223223177928bd685eb247ba02abcf.tar.gz | |
fix conflict tuple ordering
| -rwxr-xr-x | exts/pip_find_deps.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/exts/pip_find_deps.py b/exts/pip_find_deps.py index 2fe67fd..a59347b 100755 --- a/exts/pip_find_deps.py +++ b/exts/pip_find_deps.py @@ -122,8 +122,8 @@ def check_eqs(dep, version): warn('conflict! == %s conflicts with %s' % (version, dep.get_bounds_conflict(version))) - dep.conflicts.append((('==', version), - dep.get_bounds_conflict(version))) + dep.conflicts.append((dep.get_bounds_conflict(version), + ('==', version))) else: warn('conflict! == %s conflicts with == %s' @@ -135,14 +135,14 @@ def check_eqs(dep, version): dep.conflicts.append((('==', version), ('!=', version))) elif version > dep.less_than: # conflict - warn('conflict! == %s conflicts with < %s' - % (version, dep.less_than)) - dep.conflicts.append((('==', version), ('<', dep.less_than))) + warn('42 conflict! < %s conflicts with == %s' + % (dep.less_than, version)) + dep.conflicts.append((('<', dep.less_than), ('==', version))) elif version < dep.greater_than: # conflict - warn('conflict! == %s conflicts with > %s' - % (version, dep.greater_than)) - dep.conflicts.append((('==', version), ('>', dep.greater_than))) + warn('conflict! > %s conflicts with == %s' + % (dep.greater_than, version)) + dep.conflicts.append((('>', dep.greater_than), ('==', version))) def check_lt(dep, version): if dep.is_unconstrained(): |