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 25, 2024
1 parent 582d687 commit 6b9bd6b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 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
# @abstractmethod
# def request_repeated_update(self) -> Optional[Exception]:
# pass

@abstractmethod
def pre_bootloader_hint(self) -> None:
Expand Down Expand Up @@ -324,12 +324,12 @@ 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
# 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()

Expand Down

0 comments on commit 6b9bd6b

Please sign in to comment.