From d4bdccf021569077da50ff37d8e580a4bb3705c1 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 19 Jan 2019 16:06:32 +0000 Subject: [PATCH] Unconditionally cleanup cruft/smooth updates If people do not use these features then there will be nothing to remove anyway. Signed-off-by: Niels Thykier --- britney.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/britney.py b/britney.py index 73037a8..081f635 100755 --- a/britney.py +++ b/britney.py @@ -1807,16 +1807,11 @@ class Britney(object): # smooth updates removals = old_libraries(self._migration_item_factory, self.suite_info, self.options.outofsync_arches) - if self.options.smooth_updates: - self.logger.info("> Removing old packages left in the target suite from smooth updates") - if removals: - output_logger.info("Removing packages left in the target suite for smooth updates (%d):", len(removals)) - log_and_format_old_libraries(self.output_logger, removals) - self.do_all(actions=removals) - removals = old_libraries(self._migration_item_factory, self.suite_info, self.options.outofsync_arches) - else: - self.logger.info("> Not removing old packages left in the target suite from smooth updates" - " (smooth-updates disabled)") + if removals: + output_logger.info("Removing packages left in the target suite (e.g. smooth updatees or cruft)") + log_and_format_old_libraries(self.output_logger, removals) + self.do_all(actions=removals) + removals = old_libraries(self._migration_item_factory, self.suite_info, self.options.outofsync_arches) output_logger.info("List of old libraries in the target suite (%d):", len(removals)) log_and_format_old_libraries(self.output_logger, removals)