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

checkout: Dedup calls to memcache ref 

Minor, but I realized `checkout_tree_at()` is a better place to
do common setup before checkout.  Prep for
https://github.com/ostreedev/ostree/pull/813

Closes: #823
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-04-28 18:02:22 -04:00 committed by Atomic Bot
parent dae6cfba56
commit 8d8f06f21b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libostree/ostree-repo-checkout.c
View File

@ -777,6 +777,11 @@ checkout_tree_at (OstreeRepo *self,
g_assert (options->force_copy); g_assert (options->force_copy);
} }
/* Cache any directory metadata we read during this operation;
* see commit b7afe91e21143d7abb0adde440683a52712aa246
*/
g_auto(OstreeRepoMemoryCacheRef) memcache_ref;
_ostree_repo_memory_cache_ref_init (&memcache_ref, self);
return checkout_tree_at_recurse (self, options, &state, destination_parent_fd, return checkout_tree_at_recurse (self, options, &state, destination_parent_fd,
destination_name, destination_name,
source, source_info, source, source_info,
@ -829,8 +834,6 @@ ostree_repo_checkout_tree (OstreeRepo *self,
options.enable_uncompressed_cache = TRUE; options.enable_uncompressed_cache = TRUE;
canonicalize_options (self, &options); canonicalize_options (self, &options);
g_auto(OstreeRepoMemoryCacheRef) memcache_ref;
_ostree_repo_memory_cache_ref_init (&memcache_ref, self);
return checkout_tree_at (self, &options, return checkout_tree_at (self, &options,
AT_FDCWD, gs_file_get_path_cached (destination), AT_FDCWD, gs_file_get_path_cached (destination),
source, source_info, source, source_info,
@ -948,8 +951,6 @@ ostree_repo_checkout_at (OstreeRepo *self,
if (!target_info) if (!target_info)
return FALSE; return FALSE;
g_auto(OstreeRepoMemoryCacheRef) memcache_ref;
_ostree_repo_memory_cache_ref_init (&memcache_ref, self);
if (!checkout_tree_at (self, options, if (!checkout_tree_at (self, options,
destination_dfd, destination_dfd,
destination_path, destination_path,