From: Colin Walters <walters@verbum.org>
Date: Tue, 4 Apr 2017 00:35:58 +0000 (-0400)
Subject: core: Fix default value of disable_xattrs
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~329^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c937305c0e7f5609273e25753912c294b040a6ac;p=ostree.git

core: Fix default value of disable_xattrs

Sigh.  Rather awful regression from https://github.com/ostreedev/ostree/pull/759

Closes: #775
Approved by: jlebon
---

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 5e0a93ec..a8789b0e 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2075,7 +2075,7 @@ reload_core_config (OstreeRepo          *self,
 
   /* See https://github.com/ostreedev/ostree/issues/758 */
   if (!ot_keyfile_get_boolean_with_default (self->config, "core", "disable-xattrs",
-                                            TRUE, &self->disable_xattrs, error))
+                                            FALSE, &self->disable_xattrs, error))
     return FALSE;
 
   { g_autofree char *tmp_expiry_seconds = NULL;
diff --git a/tests/test-remote-gpg-import.sh b/tests/test-remote-gpg-import.sh
index 4429d8bc..a5803785 100755
--- a/tests/test-remote-gpg-import.sh
+++ b/tests/test-remote-gpg-import.sh
@@ -30,7 +30,7 @@ echo "1..4"
 
 cd ${test_tmpdir}
 mkdir repo
-${OSTREE} init
+ostree_repo_init repo
 
 #----------------------------------------------
 # Test synchronicity of keyring file and remote