Skip to content

Say when enable-fingerprint can't open the Touch ID lock - #61

Merged
maralcbr merged 1 commit into
mainfrom
touchid-options-lock-error
Oct 27, 2026
Merged

maralcbr merged 1 commit into
mainfrom
touchid-options-lock-error

Conversation

@maralcbr

Copy link
Copy Markdown
Member

Summary

Follow-up to Greptile's P2 on #55. When an agreed Mac's driver options are missing, enable-fingerprint repairs them under the Touch ID lock. If it couldn't open the lock, it said another Touch ID setup was still running, so retrying could never help. It now says the lock could not be opened, as touchid-enable and disable-fingerprint already do.

Evidence

  • omarchy-mac/test/all on Arch Linux ARM (aarch64 container), 2026-10-25: 112 ok, exit 0.
  • New test: an agreed Mac whose lock is a directory says the lock could not be opened and writes no options. It fails against the old message.

Merge Danger

Door: two-way

Message only: the same failure still stops before anything is written.

Blast Radius: Macs with Touch ID already turned on but missing their driver options

The options repair for an agreed Mac reported a lock it could not open as
another setup still running, so retrying could never help. It now says the
lock could not be opened, as touchid-enable and disable-fingerprint do.
@maralcbr
maralcbr requested a review from scottjones as a code owner October 25, 2026 00:13
@greptile-apps

greptile-apps Bot commented Oct 25, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Low impact] This PR appears safe to merge.

Summary

enable-fingerprint now distinguishes a lock that cannot be opened from a lock held by another Touch ID operation.

  • Fingerprint setup says when it cannot open the Touch ID lock.

No actionable issues found. Tests were not run during this review.

Reviews (1) · Last reviewed commit: "Say when enable-fingerprint can't open t..." · Reviewed by Greptile

@scottjones scottjones left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. We checked it against main at dad7272: it merges cleanly, and omarchy-mac/test/all passes (112 ok). Putting the old enable-fingerprint back makes the new case fail with the old "still running" text, so the test does its job.

The message only changes when the lock can't be opened. A held lock still says another setup or removal is running, and both paths still exit 1 before writing any options, so consent and the serialised setup/removal are unchanged.

On merge order: #69 rewrites this same block in omarchy-mac/entrypoints/enable-fingerprint so the agreed path always takes the lock, and it keeps the old combined mkdir/exec || flock check with the "still running" message. That brings this bug back. We'd merge this first and have #69 keep the split when it rebases.

@maralcbr
maralcbr merged commit a34fe24 into main Oct 27, 2026
7 checks passed
audreyt added a commit to audreyt/omarchy-mac-pkgs that referenced this pull request Oct 27, 2026
Resolves the enable-fingerprint lock block with omacom#61: the lock is still taken for the options and the SDDM step together, and a lock that cannot be opened is reported as such.

Co-authored-by: sisyphus-dev-ai <sisyphus-dev-ai@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants