x/anvil
Code Issues Proposed changes

Use '=' for conflicts that are hit with '!='

Browse Source 
We can't use '==' as thats not valid spec file
conflicts version syntax, using '=' is though.

Change-Id: I6040b939f3e620490daca0751cdef1b9b6365ecb
This commit is contained in:
Joshua Harlow 2014-12-19 12:26:45 -08:00
parent 8195beb97b
commit 2fafffe7ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/py2rpm
View File

@ -548,10 +548,10 @@ def requires_and_conflicts(req_list, skip_req_names=()):
if kind == "!=":
# NOTE(imelnikov): we can't conflict with ranges, so we
# put version as is and with trimmed zeroes just in case
rpm_conflicts.append('%s == %s' % (rpm_name, version))
rpm_conflicts.append('%s = %s' % (rpm_name, version))
rpm_mapping[rpm_conflicts[-1]] = req
if version != lower_version:
rpm_conflicts.append('%s == %s' % (rpm_name, lower_version))
rpm_conflicts.append('%s = %s' % (rpm_name, lower_version))
rpm_mapping[rpm_conflicts[-1]] = req
elif kind == '==':
rpm_requires.extend((