From 726d73c47cc867ee7629585cd6e3776e304aa3b3 Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Thu, 7 Nov 2019 20:06:05 +0100 Subject: [PATCH] Do not overwrite the kept_manifests variable when pruning Previously, the kept_manifests variable was overwritten every time self._prune() was called, instead of extending the list. Also, if there were no objects in the registry, it could be used uninitialized. Change-Id: I48573b8a0ed39ef072a9dc38aca60894f6d23623 --- zuul_registry/storage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zuul_registry/storage.py b/zuul_registry/storage.py index 44ef28d..b754aac 100644 --- a/zuul_registry/storage.py +++ b/zuul_registry/storage.py @@ -339,8 +339,9 @@ class Storage: if not manifest_target: continue repopath = os.path.join(namespace.path, 'repos/') + kept_manifests = [] for repo in self.backend.list_objects(repopath): - kept_manifests = self._prune(repo, manifest_target) + kept_manifests.extend(self._prune(repo, manifest_target)) # mark/sweep manifest blobs layers = set() for manifest in kept_manifests: