android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: Fix syntax error on Python 2.4

Browse Source 
Change-Id: I371d032d5a1ddde137721cbe2b24bfa38f20aaaa
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2011-03-22 19:04:47 -07:00
parent 0960b5b53d
commit e6a0eeb80d
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
subcmds/sync.py
View File

@ -164,31 +164,32 @@ later is required to fix a server side protocol bug.
# - We always make sure we call sem.release(). # - We always make sure we call sem.release().
# - We always make sure we unlock the lock if we locked it. # - We always make sure we unlock the lock if we locked it.
try: try:
success = project.Sync_NetworkHalf(quiet=opt.quiet) try:
success = project.Sync_NetworkHalf(quiet=opt.quiet)
# Lock around all the rest of the code, since printing, updating a set # Lock around all the rest of the code, since printing, updating a set
# and Progress.update() are not thread safe. # and Progress.update() are not thread safe.
lock.acquire() lock.acquire()
did_lock = True did_lock = True
if not success: if not success:
print >>sys.stderr, 'error: Cannot fetch %s' % project.name print >>sys.stderr, 'error: Cannot fetch %s' % project.name
if opt.force_broken: if opt.force_broken:
print >>sys.stderr, 'warn: --force-broken, continuing to sync' print >>sys.stderr, 'warn: --force-broken, continuing to sync'
else: else:
raise _FetchError() raise _FetchError()
fetched.add(project.gitdir) fetched.add(project.gitdir)
pm.update() pm.update()
except BaseException, e: except BaseException, e:
# Notify the _Fetch() function about all errors. # Notify the _Fetch() function about all errors.
err_event.set() err_event.set()
# If we got our own _FetchError, we don't want a stack trace. # If we got our own _FetchError, we don't want a stack trace.
# However, if we got something else (something in Sync_NetworkHalf?), # However, if we got something else (something in Sync_NetworkHalf?),
# we'd like one (so re-raise after we've set err_event). # we'd like one (so re-raise after we've set err_event).
if not isinstance(e, _FetchError): if not isinstance(e, _FetchError):
raise raise
finally: finally:
if did_lock: if did_lock:
lock.release() lock.release()