Fix immediate sync of change by change ID

When searching for a change by change ID, we attempt to immediately
since it.  Fix some errors related to that.

Change-Id: I86c57f1569dde43b267dca2283ede725b04d4764
This commit is contained in:
James E. Blair 2014-08-18 17:40:45 -07:00
parent 2708e6d2b3
commit 21411d2978
1 changed files with 5 additions and 2 deletions

View File

@ -239,7 +239,7 @@ class App(object):
if change_key is None:
if self.sync.offline:
raise Exception('Can not sync change while offline.')
task = sync.SyncChangeByNumberTask(number, sync.HIGH_PRIORITY)
task = sync.SyncChangeByNumberTask(number or changeid, sync.HIGH_PRIORITY)
self.sync.submitTask(task)
succeeded = task.wait(300)
if not succeeded:
@ -249,7 +249,10 @@ class App(object):
if not succeeded:
raise Exception('Unable to sync change.')
with self.db.getSession() as session:
change = session.getChangeByNumber(number)
if number:
change = session.getChangeByNumber(number)
elif changeid:
change = session.getChangeByChangeID(changeid)
change_key = change and change.key or None
if change_key is None:
raise Exception('Change is not in local database.')