Merge ~hloeung/ubuntu-repository-cache:fixes into ubuntu-repository-cache:master

[Haw Loeung]

Don't clean up _good for ubuntu_active and ubuntu_next

[James Simpson (jsimpso)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 3cfe9a0341d72e5ff993ff93bc01653b79deb7df

diff --git a/lib/ubuntu_repository_cache/metadata_sync.py b/lib/ubuntu_repository_cache/metadata_sync.py
index 79acaf9..dd39ff9 100644
--- a/lib/ubuntu_repository_cache/metadata_sync.py
+++ b/lib/ubuntu_repository_cache/metadata_sync.py
@@ -388,7 +388,7 @@ def rsync_should_giveup(exception):
     return True  # Do give up by default.
 
 
-def clean_metadata_dir(apache_root, log, keep=None):
+def clean_metadata_dir(apache_root, log, keep=None):   # NOQA: C901
     '''Delete non-active metadata directories'''
 
     log('Cleaning metadata directory')
@@ -423,8 +423,12 @@ def clean_metadata_dir(apache_root, log, keep=None):
         if entry not in keep:
             if entry == active:
                 log('ubuntu_active points to {}, skipping'.format(entry))
+            elif entry == '_'.join((active, 'good')):
+                log('ubuntu_active points to {}, skipping _good'.format(entry))
             elif entry == ubuntu_next:
                 log('ubuntu_next points to {}, skipping'.format(entry))
+            elif entry == '_'.join((ubuntu_next, 'good')):
+                log('ubuntu_next points to {}, skipping _good'.format(entry))
             elif os.path.isfile(entry):
                 # XXX: Should be a debug
                 log('Removing file {}'.format(entry))