From 146db8344a91ce633c0ac002495c71317994921c Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 16 Mar 2020 13:14:20 -0700 Subject: [PATCH] setup: Fix regression to force-upgrade caused by Info changes Signed-off-by: Sunil Mohan Adapa Reviewed-by: Nektarios Katakis --- plinth/setup.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plinth/setup.py b/plinth/setup.py index 349fc3bb4..e96486f52 100644 --- a/plinth/setup.py +++ b/plinth/setup.py @@ -483,18 +483,20 @@ class ForceUpgrader(): raise self.TemporaryFailure('Package manager is busy') apps = self._get_list_of_apps_to_force_upgrade() - logger.info('Apps needing conffile upgrades: %s', - ', '.join([str(app.name) for app in apps]) or 'None') + logger.info( + 'Apps needing conffile upgrades: %s', + ', '.join([str(app.app.info.name) for app in apps]) or 'None') need_retry = False for app, packages in apps.items(): try: - logger.info('Force upgrading app: %s', app.name) + logger.info('Force upgrading app: %s', app.app.info.name) if app.force_upgrade(app.setup_helper, packages): logger.info('Successfully force upgraded app: %s', - app.name) + app.app.info.name) else: - logger.info('Ignored force upgrade for app: %s', app.name) + logger.info('Ignored force upgrade for app: %s', + app.app.info.name) except Exception as exception: logger.exception('Error running force upgrade: %s', exception) need_retry = True