Skip to content

Commit

Permalink
Merge pull request #122 from INTI-CMNB/no_conflict_in_config
Browse files Browse the repository at this point in the history
Do not report warnings about conflicts in `Config` field
  • Loading branch information
SchrodingersGat authored Oct 10, 2023
2 parents 2262b59 + 21f53a3 commit a2767b1
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions kibom/component.py
Original file line number Diff line number Diff line change
Expand Up @@ -629,11 +629,12 @@ def updateField(self, field, fieldData):
elif fieldData.lower() in self.fields[field].lower():
return
else:
debug.warning("Field conflict: ({refs}) [{name}] : '{flds}' <- '{fld}'".format(
refs=self.getRefs(),
name=field,
flds=self.fields[field],
fld=fieldData).encode('utf-8'))
if field != self.prefs.configField:
debug.warning("Field conflict: ({refs}) [{name}] : '{flds}' <- '{fld}'".format(
refs=self.getRefs(),
name=field,
flds=self.fields[field],
fld=fieldData).encode('utf-8'))
self.fields[field] += " " + fieldData

def updateFields(self, usealt=False, wrapN=None):
Expand Down

0 comments on commit a2767b1

Please sign in to comment.