Merge charm-hw-health:lp1943748 into charm-hw-health:master

[Facundo Ciccioli]

Ensure libncurses5 is there for megacli

There two scenarios were tested:

1. On a focal deployment, refresh the charm. libncurses5 gets installed and megacli starts working.

2. On a bionic deployment, refresh the charm. Then upgrade to focal. libncurses5 is still installed and megacli works.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:16364e5f7652f5a5ffbdf125b69864b461b5c0d5
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/52/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/256/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/916/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/52//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:11728de35fbae3bc94539e6b36d358169004e752
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/54/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/258/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/933/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/54//rebuild

review: Approve (continuous-integration)

[John Lettman (jplettman)]

Approved on peer review. Changes function and resolve the referenced bug.

review: Approve (peer)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision d15f7f4d24880773b33c28f25fb7f163c102e6ba

diff --git a/src/lib/hwhealth/tools.py b/src/lib/hwhealth/tools.py
index b92ba15..4378b4f 100644
--- a/src/lib/hwhealth/tools.py
+++ b/src/lib/hwhealth/tools.py
@@ -487,7 +487,8 @@ class AptVendorTool(Tool):
                 options=["--download-only" for _ in self.apt_packages],
             )
         else:
-            apt.queue_install(self.apt_packages)
+            # NOTE: The options parameter is set explicitly to workaround LP#1959919.
+            apt.queue_install(self.apt_packages, options=[])
 
     def _add_apt_source(self):
         series = lsb_release()["DISTRIB_CODENAME"]
@@ -593,6 +594,14 @@ class MegaCLI(VendorTool):
             "1a68e6646d1e3dfb7039f581be994500d0ed02de2f928e57399e86473d4c8662",
         ]
 
+    def install(self):
+        # From focal onward we ship with libncurses6, megacli needs v5.  On bionic and
+        # previous the library is already installed, so this is a noop there.
+        # LP#1943748
+        # NOTE: The options parameter is set explicitly to workaround LP#1959919.
+        apt.queue_install(["libncurses5"], options=[])
+        super().install()
+
 
 class PercCLI(VendorTool):
     """A class representing the perccli tool.
diff --git a/src/tox.ini b/src/tox.ini
index 7da331e..b392f62 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -25,7 +25,7 @@ passenv =
 [testenv:lint]
 commands =
     flake8
-    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
+    black --diff --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
 deps =
     black
     flake8