From 73791e48d0b567b697f3b2fff86086da76fc319d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 6 Jan 2019 12:15:15 +0000 Subject: [PATCH] Rename migrate_item{,s}_to_target_suite It accepts multiple items, so using a singular "item" seems like a misfeature. Signed-off-by: Niels Thykier --- britney.py | 8 ++++---- britney2/migration.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/britney.py b/britney.py index 6926877..834a8a6 100755 --- a/britney.py +++ b/britney.py @@ -1475,7 +1475,7 @@ class Britney(object): with mm.start_transaction() as transaction: accepted = False try: - accepted, nuninst_after, failed_arch, new_cruft = mm.migrate_item_to_target_suite( + accepted, nuninst_after, failed_arch, new_cruft = mm.migrate_items_to_target_suite( comp, nuninst_last_accepted ) @@ -1607,9 +1607,9 @@ class Britney(object): if init: # init => a hint (e.g. "easy") - so do the hint run - (_, nuninst_end, _, new_cruft) = mm.migrate_item_to_target_suite(selected, - self.nuninst_orig, - stop_on_first_regression=False) + (_, nuninst_end, _, new_cruft) = mm.migrate_items_to_target_suite(selected, + self.nuninst_orig, + stop_on_first_regression=False) if recurse: # Ensure upgrade_me and selected do not overlap, if we diff --git a/britney2/migration.py b/britney2/migration.py index a50001f..90ef9e6 100644 --- a/britney2/migration.py +++ b/britney2/migration.py @@ -88,7 +88,7 @@ class MigrationManager(object): InstallabilityTester. - Unlike migrate_item_to_target_suite, this will not modify + Unlike migrate_items_to_target_suite, this will not modify any data structure. """ # local copies for better performances @@ -401,7 +401,7 @@ class MigrationManager(object): return is_source_migration, affected_architectures, affected_direct, affected_all, smooth_updates - def migrate_item_to_target_suite(self, items, nuninst_now, stop_on_first_regression=True): + def migrate_items_to_target_suite(self, items, nuninst_now, stop_on_first_regression=True): is_accepted = True target_suite = self.suite_info.target_suite packages_t = target_suite.binaries