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

repo: Minor cleanup: Move size generation code initialization 

It has a global effect, so do it in the entrypoint.
This commit is contained in:
Colin Walters 2014-12-15 22:55:56 -05:00
parent 880940f93b
commit abb88336b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libostree/ostree-repo-commit.c
View File

@ -2109,11 +2109,6 @@ write_directory_to_mtree_internal (OstreeRepo *self,
g_debug ("Examining: %s", gs_file_get_path_cached (dir)); g_debug ("Examining: %s", gs_file_get_path_cached (dir));
if (modifier && modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES)
{
self->generate_sizes = TRUE;
}
/* If the directory is already in the repository, we can try to /* If the directory is already in the repository, we can try to
* reuse checksums to skip checksumming. */ * reuse checksums to skip checksumming. */
if (OSTREE_IS_REPO_FILE (dir) && modifier == NULL) if (OSTREE_IS_REPO_FILE (dir) && modifier == NULL)
@ -2233,6 +2228,11 @@ ostree_repo_write_directory_to_mtree (OstreeRepo *self,
gboolean ret = FALSE; gboolean ret = FALSE;
GPtrArray *path = NULL; GPtrArray *path = NULL;
if (modifier && modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES)
{
self->generate_sizes = TRUE;
}
path = g_ptr_array_new (); path = g_ptr_array_new ();
if (!write_directory_to_mtree_internal (self, dir, mtree, modifier, path, if (!write_directory_to_mtree_internal (self, dir, mtree, modifier, path,
cancellable, error)) cancellable, error))