diff --git a/runbot_merge/models/crons/git_maintenance.py b/runbot_merge/models/crons/git_maintenance.py index 29dd028a..3c34adfa 100644 --- a/runbot_merge/models/crons/git_maintenance.py +++ b/runbot_merge/models/crons/git_maintenance.py @@ -29,9 +29,16 @@ class GC(models.TransientModel): continue _gc.info('Running maintenance on %s', repo.name) + r = repo_git\ + .stdout(True)\ + .with_config(stderr=subprocess.STDOUT, text=True, check=False)\ + .remote('prune', 'origin') + if r.returncode: + _gc.warning("Prune failure (status=%d):\n%s", r.returncode, r.stdout) + r = repo_git\ .stdout(True)\ .with_config(stderr=subprocess.STDOUT, text=True, check=False)\ .gc('--prune=now', aggressive=True) if r.returncode: - _gc.warning("Maintenance failure (status=%d):\n%s", r.returncode, r.stdout) + _gc.warning("GC failure (status=%d):\n%s", r.returncode, r.stdout)