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

lib/repo: Port bareuser-conversion stat to bare load 

I noticed this is a simple call that's useful to port to the new internal-only
non-allocating API.

Closes: #977
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-28 21:50:10 -04:00 committed by Atomic Bot
parent 064d7bffef
commit 250e305f73
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3074,25 +3074,24 @@ import_one_object_link (OstreeRepo *self,
*/ */
if (import_is_bareuser_only_conversion (source, self, objtype)) if (import_is_bareuser_only_conversion (source, self, objtype))
{ {
g_autoptr(GFileInfo) finfo = NULL; struct stat stbuf;
if (!ostree_repo_load_file (source, checksum, NULL, &finfo, NULL, if (!_ostree_repo_load_file_bare (source, checksum, NULL, &stbuf,
cancellable, error)) NULL, NULL, cancellable, error))
return FALSE; return FALSE;
switch (g_file_info_get_file_type (finfo)) if (S_ISREG (stbuf.st_mode))
{ {
case G_FILE_TYPE_REGULAR:
/* This is OK, we'll drop through and try a hardlink */ /* This is OK, we'll drop through and try a hardlink */
break; }
case G_FILE_TYPE_SYMBOLIC_LINK: else if (S_ISLNK (stbuf.st_mode))
{
/* NOTE early return */ /* NOTE early return */
*out_was_supported = FALSE; *out_was_supported = FALSE;
return TRUE; return TRUE;
default:
g_assert_not_reached ();
break;
} }
else
g_assert_not_reached ();
} }
if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, loose_path_buf, cancellable, error)) if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, loose_path_buf, cancellable, error))