ttygroup
/
gertty
Code Issues Proposed changes

Hide errors when syncing conflicts 

This is now an optional feature and does not appear in the upstream
gerrit.

Change-Id: Ib29ee107455794465986b04270737590696d5c76
This commit is contained in:
James E. Blair 2020-02-20 09:47:09 -08:00
parent 64b8d6dc6c
commit 2df6a24693
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gertty/sync.py
View File

@ -595,8 +595,8 @@ class SyncChangeTask(Task):
remote_conflicts = sync.query(['q=status:open+is:mergeable+conflicts:%s' %
remote_change['_number']])
except Exception:
self.log.exception("Unable to sync conflicts for change %s" % self.change_id)
warnings.warn("Unable to sync conflicts for change %s" % self.change_id)
# Conflicts are now optional
self.log.debug("Unable to sync conflicts for change %s" % self.change_id)
remote_conflicts = []
fetches = collections.defaultdict(list)