Skip to content

Commit

Permalink
Remove two step update handling on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
mmerklinger committed Oct 29, 2024
1 parent 26e38eb commit 9806416
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- Remove `ecdsa` dependency
- Remove two step update handling on macOS

[All Changes](https://github.com/Nitrokey/nitrokey-sdk-py/compare/v0.2.2...HEAD)

Expand Down
11 changes: 2 additions & 9 deletions src/nitrokey/nk3/updates.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ def confirm_extra_information(self, extra_info: List[str]) -> None:
def confirm_update_same_version(self, version: Version) -> None:
pass

@abstractmethod
def request_repeated_update(self) -> Optional[Exception]:
pass
warnings.warn("UpdateUi.request_repeated_update is no longer needed", DeprecationWarning)
return None

@abstractmethod
def pre_bootloader_hint(self) -> None:
Expand Down Expand Up @@ -324,13 +324,6 @@ def _get_bootloader(self, device: TrussedBase) -> Iterator[NK3Bootloader]:
# needed for udev to properly handle new device
time.sleep(1)

maybe_exc = self.ui.request_repeated_update()
if platform.system() == "Darwin" and maybe_exc is not None:
# Currently there is an issue with device enumeration after reboot on macOS, see
# <https://github.com/Nitrokey/pynitrokey/issues/145>. To avoid this issue, we
# cancel the command now and ask the user to run it again.
raise maybe_exc

self.ui.pre_bootloader_hint()

exc = None
Expand Down

0 comments on commit 9806416

Please sign in to comment.