From 1834a71b1f4856612e5d0638d1f82e9831e89a39 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 20 Jul 2014 12:18:09 -0400 Subject: [PATCH] core: Do enumerate content objects in archive-z2 repositories Prune has worked fine on bare repositories for some time, but now that I finally try to delete data on the server side, I notice we weren't actually enumerating content objects =/ That caused them to not be pruned. https://bugzilla.gnome.org/show_bug.cgi?id=733458 --- src/libostree/ostree-repo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 583d685b..1aa48e62 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -1021,7 +1021,10 @@ list_loose_objects_at (OstreeRepo *self, if (!dot) continue; - if (strcmp (dot, ".file") == 0) + if ((self->mode == OSTREE_REPO_MODE_ARCHIVE_Z2 + && strcmp (dot, ".filez") == 0) || + (self->mode == OSTREE_REPO_MODE_BARE + && strcmp (dot, ".file") == 0)) objtype = OSTREE_OBJECT_TYPE_FILE; else if (strcmp (dot, ".dirtree") == 0) objtype = OSTREE_OBJECT_TYPE_DIR_TREE;