Skip to content
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.

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

driver/usbstoragedriver: use udisk2 only when calling write_file #1351

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

jluebbe
Copy link
Member

@jluebbe jluebbe commented Apr 9, 2024

Otherwise, udisks2 and gi are needed for all installations, even if write_files is never used.

Fixes: #1219

@jluebbe jluebbe added the fix label Apr 9, 2024
@@ -75,6 +80,8 @@ def write_files(self, sources, target, partition, target_is_directory=True):
target_is_directory (bool): Whether target is a directory
"""

self._start_wrapper()
Copy link
Member

Choose a reason for hiding this comment

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

I think another if self.wrapper: is required here, otherwise we restart a new AgentWrapper for every write_files() call.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've added the check to _start_wrapper().

Otherwise, udisks2 and gi are needed for all installations, even if
write_files is never used.

Fixes: labgrid-project#1219
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
@MischaZihler
Copy link
Contributor

MischaZihler commented Apr 9, 2024

that fixed it for us

@jluebbe jluebbe requested a review from Emantor April 9, 2024 15:01
@jluebbe jluebbe marked this pull request as ready for review April 9, 2024 15:01
@a3f
Copy link
Contributor

a3f commented Apr 9, 2024

labgrid-client write-files continues to work me with this change applied.

Sorry for the breakage!

@Emantor Emantor merged commit fbf25cf into labgrid-project:master Apr 10, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants