shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity

lib/checkout: Move special case for subpath of file to toplevel

Browse Source 
Since we now have a cleaner separation of "toplevel checkout prep"
versus "recursive checkout", handle the special case of checking out
a single file at first rather than later.

Prep for future work in optimizing this function more.

Closes: #848
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-05-10 21:43:26 -04:00 committed by Atomic Bot
parent 986e05e3fd
commit 7896bcbe65
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,15 +666,6 @@ checkout_tree_at_recurse (OstreeRepo *self,
return FALSE;
}
/* Note early return here! */
if (g_file_info_get_file_type (source_info) != G_FILE_TYPE_DIRECTORY)
return checkout_one_file_at (self, options, state,
(GFile *) source,
source_info,
destination_dfd,
g_file_info_get_name (source_info),
cancellable, error);
g_autoptr(GFileEnumerator) dir_enum =
g_file_enumerate_children ((GFile*)source,
OSTREE_GIO_FAST_QUERYINFO,
@ -789,6 +780,15 @@ checkout_tree_at (OstreeRepo *self,
g_assert (options->force_copy);
}
/* Special case handling for subpath of a non-directory */
if (g_file_info_get_file_type (source_info) != G_FILE_TYPE_DIRECTORY)
return checkout_one_file_at (self, options, &state,
(GFile *) source,
source_info,
destination_parent_fd,
g_file_info_get_name (source_info),
cancellable, error);
/* Cache any directory metadata we read during this operation;
* see commit b7afe91e21143d7abb0adde440683a52712aa246
*/