Skip to content

fix: guard flock(LOCK_UN) against OSError in kanban_db and google_oauth #35204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
annguyenNous wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: guard flock(LOCK_UN) against OSError in kanban_db and google_oauth #35204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/google_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def _credentials_lock(timeout_seconds: float = LOCK_TIMEOUT_SECONDS):
import fcntl

fcntl.flock(fd, fcntl.LOCK_UN)
except ImportError:
except (ImportError, OSError):

@teknium1 teknium1 Jul 13, 2026

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.

agent/google_oauth.py was deleted on current main by 7130d60861a9243301514bff611a9381830d59d8; omit this hunk when salvaging the still-relevant Kanban fix.

try:
import msvcrt # type: ignore[import-not-found]

Expand Down
5 changes: 4 additions & 1 deletion hermes_cli/kanban_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,10 @@ def _cross_process_init_lock(path: Path):
else:
import fcntl

fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
try:
fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
except OSError:

@teknium1 teknium1 Jul 13, 2026

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.

The same cleanup concern remains on current main, but this hunk's context is stale: apply the guard to the current POSIX unlock at hermes_cli/kanban_db.py:1410 and add a regression test that makes that unlock raise OSError.

pass
finally:
handle.close()

Expand Down
Loading