Merge pull request #932 from mslacken/WarnNotErr
warn and don't show scary error on syncuids
This commit is contained in:
@@ -113,8 +113,8 @@ func (db syncDB) checkConflicts() error {
|
||||
for nameInHost, hostIds := range db {
|
||||
if hostIds.HostID == containerIds.ContainerID {
|
||||
errorMsg := fmt.Sprintf("id(%v) collision: host(%s) container(%s)", containerIds.ContainerID, nameInHost, nameInContainer)
|
||||
wwlog.Error(errorMsg)
|
||||
wwlog.Error("add %s to host to resolve conflict", nameInContainer)
|
||||
wwlog.Warn(errorMsg)
|
||||
wwlog.Warn("add %s to host to resolve conflict", nameInContainer)
|
||||
return errors.New(errorMsg)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user