cockpit: fix subprocess invocation in frozen binaries#9331
Merged
ThomasWaldmann merged 1 commit intoborgbackup:masterfrom Feb 14, 2026
Merged
cockpit: fix subprocess invocation in frozen binaries#9331ThomasWaldmann merged 1 commit intoborgbackup:masterfrom
ThomasWaldmann merged 1 commit intoborgbackup:masterfrom
Conversation
When running as a Pyinstaller-made binary, sys.executable points to the borg binary itself. Invoking it with "-m borg" resulted in an incorrect command line (e.g., "borg -m borg ..."), which confused the argument parser in the subprocess. This change checks sys.frozen to determine the correct invocation: - If frozen: [sys.executable, ...args] - If not frozen: [sys.executable, "-m", "borg", ...args]
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #9331 +/- ##
==========================================
- Coverage 75.93% 75.92% -0.02%
==========================================
Files 86 86
Lines 14780 14782 +2
Branches 2202 2203 +1
==========================================
Hits 11223 11223
- Misses 2880 2882 +2
Partials 677 677 ☔ View full report in Codecov by Sentry. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When running as a Pyinstaller-made binary, sys.executable points to the borg binary itself. Invoking it with "-m borg" resulted in an incorrect command line (e.g., "borg -m borg ..."), which confused the argument parser in the subprocess.
This change checks sys.frozen to determine the correct invocation:
Fixes #9277.