diff --git a/utils/update_checkout/tests/test_update_worktree.py b/utils/update_checkout/tests/test_update_worktree.py index bed64b03c583e..0426c94b2ee1c 100644 --- a/utils/update_checkout/tests/test_update_worktree.py +++ b/utils/update_checkout/tests/test_update_worktree.py @@ -12,9 +12,9 @@ import os -from scheme_mock import call_quietly - from . import scheme_mock +from .scheme_mock import call_quietly + WORKTREE_NAME = "feature" diff --git a/utils/update_checkout/update_checkout/update_checkout.py b/utils/update_checkout/update_checkout/update_checkout.py index 0f1f38dfb0ccc..2528873925d2c 100755 --- a/utils/update_checkout/update_checkout/update_checkout.py +++ b/utils/update_checkout/update_checkout/update_checkout.py @@ -166,7 +166,7 @@ def update_single_repository(pool_args): result = shell.run(['git', 'rev-parse', checkout_target]) revision = result[0].strip() shell.run(['git', 'checkout', revision], echo=True) - except Exception as e: + except Exception: raise originalException # It's important that we checkout, fetch, and rebase, in order.