Filter .trees from artifacts for culling

Rather than saving after cull.

2 files changed, 2 insertions, 2 deletions

diff --git a/ybd/__main__.py b/ybd/__main__.py
index 7014280..5be770e 100755
--- a/ybd/__main__.py
+++ b/ybd/__main__.py
@@ -93,13 +93,12 @@ with timer('TOTAL'):
         log('ARCH', 'No definitions for', config['arch'], exit=True)
 
     write_cache_key()
+    app.defs.save_trees()
     if config.get('mode', 'normal') == 'keys-only':
         os._exit(0)
 
     cache.cull(config['artifacts'])
 
-    app.defs.save_trees()
-
     sandbox.executor = sandboxlib.executor_for_platform()
     log(config['target'], 'Sandbox using %s' % sandbox.executor)
     if sandboxlib.chroot == sandbox.executor:
diff --git a/ybd/cache.py b/ybd/cache.py
index f3b312d..b12d0f3 100644
--- a/ybd/cache.py
+++ b/ybd/cache.py
@@ -324,6 +324,7 @@ def cull(artifact_dir):
 
     def clear(deleted, artifact_dir):
         artifacts = utils.sorted_ls(artifact_dir)
+        artifacts[:] = [a for a in artifacts if a != '.trees']
         for artifact in artifacts:
             stat = os.statvfs(artifact_dir)
             free = stat.f_frsize * stat.f_bavail / 1000000000