From ddf0a02f88f27dcb477295863f8f4369820c8254 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 23 Mar 2016 09:28:17 +0100 Subject: [PATCH] pull local: Don't import objects we already have In particular, I noticed this because the pull failed when trying to pull from a shallow repo which only had the new objects that was needed. https://bugzilla.gnome.org/show_bug.cgi?id=764059 --- src/libostree/ostree-repo-pull.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index d27b15ea..ecbd7386 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -1188,7 +1188,8 @@ scan_one_metadata_object_c (OtPullData *pull_data, if (pull_data->remote_repo_local) { - if (!ostree_repo_import_object_from (pull_data->repo, pull_data->remote_repo_local, + if (!is_stored && + !ostree_repo_import_object_from (pull_data->repo, pull_data->remote_repo_local, objtype, tmp_checksum, cancellable, error)) goto out;