packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Only load /etc/ostree/remotes.d for system repo 

They shouldn't be loaded for random test/personal repositories.  Doing
so triggers another bug in that we return them from
ostree_repo_get_config() when then causes clients to write them out
permanently to disk with ostree_repo_write_config().  This caused test
suite failures.
This commit is contained in:
Colin Walters 2014-05-26 18:36:03 -04:00
parent 62c2a204c9
commit a4d01976bb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libostree/ostree-repo.c
View File

@ -682,8 +682,15 @@ ostree_repo_open (OstreeRepo *self,
TRUE, &self->enable_uncompressed_cache, error)) TRUE, &self->enable_uncompressed_cache, error))
goto out; goto out;
if (!append_remotes_d (self, cancellable, error)) {
goto out; gs_unref_object GFile *default_repo_path = get_default_repo_path ();
if (g_file_equal (self->repodir, default_repo_path))
{
if (!append_remotes_d (self, cancellable, error))
goto out;
}
}
if (!gs_file_open_dir_fd (self->objects_dir, &self->objects_dir_fd, cancellable, error)) if (!gs_file_open_dir_fd (self->objects_dir, &self->objects_dir_fd, cancellable, error))
goto out; goto out;