summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2014-07-20 12:18:09 -0400
committerColin Walters <walters@verbum.org>2014-07-21 07:25:51 -0400
commit1834a71b1f4856612e5d0638d1f82e9831e89a39 (patch)
treede3e2742927c63315a9dd39e64b1b9a7f52c675d
parent72da2e0c36144b0ddbfddbcd177643bb91fd7906 (diff)
downloadostree-1834a71b1f4856612e5d0638d1f82e9831e89a39.tar.gz
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
-rw-r--r--src/libostree/ostree-repo.c5
1 files changed, 4 insertions, 1 deletions
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;