Skip to content

refactor: move gvfs envs to OstreeRepo ctor #1197

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

Merged
reddevillg merged 1 commit into from
Jun 4, 2025
Merged

refactor: move gvfs envs to OstreeRepo ctor #1197

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
12 changes: 0 additions & 12 deletions apps/ll-builder/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,14 +948,6 @@ You can report bugs to the linyaps team under this project: https://github.com/O
return -1;
}

// To avoid glib start thread
// set GIO_USE_VFS to local and GVFS_REMOTE_VOLUME_MONITOR_IGNORE to 1
auto gioGuard =
std::make_unique<linglong::utils::command::EnvironmentVariableGuard>("GIO_USE_VFS", "local");
auto gvfsGuard = std::make_unique<linglong::utils::command::EnvironmentVariableGuard>(
"GVFS_REMOTE_VOLUME_MONITOR_IGNORE",
"1");

auto result = linglong::repo::tryMigrate(builderCfg->repo, *repoCfg);
if (result == linglong::repo::MigrateResult::Failed) {
if (!backupFailedMigrationRepo(builderCfg->repo)) {
Expand All @@ -973,10 +965,6 @@ You can report bugs to the linyaps team under this project: https://github.com/O

linglong::repo::OSTreeRepo repo(repoRoot, *repoCfg, clientFactory);

// restore to original value
gioGuard.reset();
gvfsGuard.reset();

if (buildRepo->parsed()) {
return handleRepo(repo,
repoCmdOpts,
Expand Down
8 changes: 8 additions & 0 deletions libs/linglong/src/linglong/repo/ostree_repo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,14 @@ OSTreeRepo::OSTreeRepo(const QDir &path,
qFatal("%s", msg.c_str());
}

// To avoid glib start thread
// set GIO_USE_VFS to local and GVFS_REMOTE_VOLUME_MONITOR_IGNORE to 1
linglong::utils::command::EnvironmentVariableGuard gioGuard{ "GIO_USE_VFS", "local" };
linglong::utils::command::EnvironmentVariableGuard gvfsGuard{
"GVFS_REMOTE_VOLUME_MONITOR_IGNORE",
"1"
};

g_autoptr(GError) gErr = nullptr;
g_autoptr(GFile) repoPath = nullptr;
g_autoptr(OstreeRepo) ostreeRepo = nullptr;
Expand Down