setup: Fix regression to force-upgrade caused by Info changes

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>

Reviewed-by: Nektarios Katakis <iam@nektarioskatakis.xyz>
This commit is contained in:
Sunil Mohan Adapa 2020-03-16 13:14:20 -07:00 committed by Nektarios Katakis
parent 476b0e966c
commit 146db8344a
No known key found for this signature in database
GPG Key ID: 9CA475E691EBCF76

View File

@ -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