diff options
| author | Jason Chang <jasonnc@google.com> | 2024-02-05 15:15:20 -0800 |
|---|---|---|
| committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-02-06 18:46:19 +0000 |
| commit | 26fa3180fbe2380ff20eb94171074d833b210b45 (patch) | |
| tree | 86c01b4e676449b48a85df49012a73d803faad46 | |
| parent | d379e77f44d11da1ab817f3796f9559f163c1b0f (diff) | |
| download | git-repo-26fa3180fbe2380ff20eb94171074d833b210b45.tar.gz | |
sync: ensure RepoChangedException propagated
Prior to this change RepoChangedException would be caught and re-rasied
as a different exception. This would prevent RepoChangedException
handler from running in main.py
Bug: b/323232806
Change-Id: I9055ff95d439d6ff225206c5bf1755cc718bcfcc
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/407144
Tested-by: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
| -rw-r--r-- | subcmds/sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 233c9f40..6004e306 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -1628,7 +1628,7 @@ later is required to fix a server side protocol bug. | |||
| 1628 | errors = [] | 1628 | errors = [] |
| 1629 | try: | 1629 | try: |
| 1630 | self._ExecuteHelper(opt, args, errors) | 1630 | self._ExecuteHelper(opt, args, errors) |
| 1631 | except RepoExitError: | 1631 | except (RepoExitError, RepoChangedException): |
| 1632 | raise | 1632 | raise |
| 1633 | except (KeyboardInterrupt, Exception) as e: | 1633 | except (KeyboardInterrupt, Exception) as e: |
| 1634 | raise RepoUnhandledExceptionError(e, aggregate_errors=errors) | 1634 | raise RepoUnhandledExceptionError(e, aggregate_errors=errors) |