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

deploy: Update to use latest libgsystem API

This commit is contained in:
Colin Walters 2015-01-03 12:03:36 -05:00
parent 01f6d68c60
commit 6dab41ba77
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libostree/ostree-sysroot-deploy.c
View File

@ -33,25 +33,6 @@
#define OSTREE_CONFIGMERGE_ID "d3863baec13e4449ab0384684a8af3a7" #define OSTREE_CONFIGMERGE_ID "d3863baec13e4449ab0384684a8af3a7"
#define OSTREE_DEPLOYMENT_COMPLETE_ID "dd440e3e549083b63d0efc7dc15255f1" #define OSTREE_DEPLOYMENT_COMPLETE_ID "dd440e3e549083b63d0efc7dc15255f1"
/* FIXME when we depend on new enough libgsystem, move to
* gs_dfd_and_name_get_all_xattrs().
*/
static gboolean
dfd_and_name_get_all_xattrs (int dfd,
const char *name,
GVariant **out_xattrs,
GCancellable *cancellable,
GError **error)
{
/* A workaround for the lack of lgetxattrat(), thanks to Florian Weimer:
* https://mail.gnome.org/archives/ostree-list/2014-February/msg00017.html
*/
gs_free char *path = g_strdup_printf ("/proc/self/fd/%d/%s", dfd, name);
gs_unref_object GFile *fpath = g_file_new_for_path (path);
return gs_file_get_all_xattrs (fpath, out_xattrs,
cancellable, error);
}
static gboolean static gboolean
copy_one_file_fsync_at (int src_parent_dfd, copy_one_file_fsync_at (int src_parent_dfd,
int dest_parent_dfd, int dest_parent_dfd,
@ -63,9 +44,9 @@ copy_one_file_fsync_at (int src_parent_dfd,
gboolean ret = FALSE; gboolean ret = FALSE;
gs_unref_variant GVariant *src_xattrs = NULL; gs_unref_variant GVariant *src_xattrs = NULL;
if (!dfd_and_name_get_all_xattrs (src_parent_dfd, name, if (!gs_dfd_and_name_get_all_xattrs (src_parent_dfd, name,
&src_xattrs, &src_xattrs,
cancellable, error)) cancellable, error))
goto out; goto out;
if (S_ISREG (stbuf->st_mode)) if (S_ISREG (stbuf->st_mode))
@ -184,8 +165,8 @@ dirfd_copy_attributes_and_xattrs (int src_parent_dfd,
* right. This will allow other users access if they have ACLs, but * right. This will allow other users access if they have ACLs, but
* oh well. * oh well.
*/ */
if (!dfd_and_name_get_all_xattrs (src_parent_dfd, src_name, if (!gs_dfd_and_name_get_all_xattrs (src_parent_dfd, src_name,
&xattrs, cancellable, error)) &xattrs, cancellable, error))
goto out; goto out;
if (!gs_fd_set_all_xattrs (dest_dfd, xattrs, if (!gs_fd_set_all_xattrs (dest_dfd, xattrs,
cancellable, error)) cancellable, error))