You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.4 KiB
38 lines
1.4 KiB
6 years ago
|
From c79d792fd583e92750bdaabcbc9275866bda9976 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Colin Walters <walters@verbum.org>
|
||
|
|
Date: Wed, 16 Jan 2019 08:30:53 -0500
|
||
|
|
Subject: [PATCH 1/2] =?UTF-8?q?lib/commit:=20Fix=20bare=20=E2=86=92=20bare?=
|
||
|
|
=?UTF-8?q?=20imports?=
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Regression from https://github.com/ostreedev/ostree/pull/1771
|
||
|
|
|
||
|
|
This broke rpmostreepayload in Anaconda where we import a bare repo:
|
||
|
|
https://openqa.fedoraproject.org/tests/345339#step/_do_install_and_reboot/4
|
||
|
|
|
||
|
|
Reported-by: Adam Williamson <adamwill@fedoraproject.org>
|
||
|
|
|
||
|
|
Closes: #1803
|
||
|
|
Approved by: jlebon
|
||
|
|
---
|
||
|
|
src/libostree/ostree-repo-commit.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
|
||
|
|
index 533cf03a..c95e0b61 100644
|
||
|
|
--- a/src/libostree/ostree-repo-commit.c
|
||
|
|
+++ b/src/libostree/ostree-repo-commit.c
|
||
|
|
@@ -4269,7 +4269,7 @@ import_one_object_direct (OstreeRepo *dest_repo,
|
||
|
|
G_IN_SET (src_repo->mode, OSTREE_REPO_MODE_BARE, OSTREE_REPO_MODE_BARE_USER);
|
||
|
|
if (src_is_bare_or_bare_user && !OSTREE_OBJECT_TYPE_IS_META(objtype))
|
||
|
|
{
|
||
|
|
- if (src_repo == OSTREE_REPO_MODE_BARE)
|
||
|
|
+ if (src_repo->mode == OSTREE_REPO_MODE_BARE)
|
||
|
|
{
|
||
|
|
g_autoptr(GVariant) xattrs = NULL;
|
||
|
|
if (!glnx_fd_get_all_xattrs (src_fd, &xattrs,
|
||
|
|
--
|
||
|
|
2.20.1
|