fixup! checkout: Add force_copy+SELinux options for checkout, use in …

…deploy
ostreedev · Apr 19, 2017 · 79ea5ba · 79ea5ba
1 parent f4eeb11
commit 79ea5ba
Showing 1 changed file with 1 addition and 7 deletions.
diff --git 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"),