setup: Clarify success log message when force upgrading

Currently, in cases of ignoring an upgrade and actually upgrading, the log
message says success which is somewhat confusing. Make the force_upgrade()
methods in apps return information about ignoring the upgrade and print log
message accordingly.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>

plinth/modules/bind/__init__.py

@@ -126,6 +126,7 @@ def setup(helper, old_version=None):
 def force_upgrade(helper, _packages):
     """Force upgrade the managed packages to resolve conffile prompt."""
     helper.install(managed_packages, force_configuration='old')
+    return True
 
 
 def diagnose():

plinth/modules/firewall/__init__.py

@@ -79,16 +79,17 @@ def setup(helper, old_version=None):
 def force_upgrade(helper, packages):
     """Force upgrade firewalld to resolve conffile prompts."""
     if 'firewalld' not in packages:
-        return
+        return False
 
     # firewalld 0.4.4.6-2 -> 0.6.x
     package = packages['firewalld']
     if Version(package['current_version']) >= Version('0.6') or \
        Version(package['new_version']) < Version('0.6'):
-        return
+        return False
 
     helper.install(['firewalld'], force_configuration='new')
     _run(['setup'], superuser=True)
+    return True
 
 
 def get_enabled_status():

plinth/modules/ttrss/__init__.py

@@ -123,16 +123,17 @@ def setup(helper, old_version=None):
 def force_upgrade(helper, packages):
     """Force update package to resolve conffile prompts."""
     if 'tt-rss' not in packages:
-        return
+        return False
 
     # tt-rss 17.4 -> 18.12
     package = packages['tt-rss']
     if Version(package['current_version']) >= Version('18.12') or \
        Version(package['new_version']) < Version('18.12'):
-        return
+        return False
 
     helper.install(['tt-rss'], force_configuration='new')
     actions.superuser_run('ttrss', ['setup'])
+    return True
 
 
 def diagnose():

plinth/setup.py

@@ -508,8 +508,11 @@ class ForceUpgrader():
         for app, packages in apps.items():
             try:
                 logger.info('Force upgrading app: %s', app.name)
-                app.force_upgrade(app.setup_helper, packages)
-                logger.info('Successfully force upgraded app: %s', app.name)
+                if app.force_upgrade(app.setup_helper, packages):
+                    logger.info('Successfully force upgraded app: %s',
+                                app.name)
+                else:
+                    logger.info('Ignored force upgrade for app: %s', app.name)
             except Exception as exception:
                 logger.exception('Error running force upgrade: %s', exception)
                 need_retry = True