From 79ea5ba9cb896c5e226f304414a49c1db5e716f8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 19 Apr 2017 06:12:59 -0400 Subject: [PATCH] fixup! checkout: Add force_copy+SELinux options for checkout, use in deploy --- src/libostree/ostree-repo-checkout.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index 3b9c80d42f..cc2ed14233 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -217,14 +217,8 @@ create_file_copy_from_input_at (OstreeRepo *repo, g_autoptr(GVariant) modified_xattrs = NULL; /* If we're doing SELinux labeling, prepare it */ - if (options->sepolicy) + if (options->sepolicy && !repo->disable_xattrs) { - static gboolean printed; - if (!printed) - { - g_printerr ("doing fscreatecon for %s\n", state->selabel_path_buf->str); - printed = 1; - } if (!_ostree_sepolicy_preparefscreatecon (&fscreatecon, options->sepolicy, state->selabel_path_buf->str, g_file_info_get_attribute_uint32 (file_info, "unix::mode"),