diff options
| author | Bryan Quigley <bryan.quigley@canonical.com> | 2019-04-23 14:07:06 -0700 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@redhat.com> | 2019-08-25 22:40:47 +0200 |
| commit | 46fc58c79f6f0441d55e3fd524dccacc0ed84132 (patch) | |
| tree | 7832ddd929fb219e0cd0c2e80e5965eaf822f481 | |
| parent | aa335b50ef866a3e567476ebc089407d7fef3c60 (diff) | |
| download | sos-46fc58c79f6f0441d55e3fd524dccacc0ed84132.tar.gz | |
[lstopo] Fix to not depend on distutils
This adds support for Ubuntu and drops the depends
on distutils replacing with the sos utility.
I believe the functionality should be the same, and
appears to work on Ubuntu.
Closes: #1656
Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/lstopo.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sos/plugins/lstopo.py b/sos/plugins/lstopo.py index 39c3e6dd..7f0fc2f8 100644 --- a/sos/plugins/lstopo.py +++ b/sos/plugins/lstopo.py @@ -7,7 +7,7 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin -from distutils.spawn import find_executable +from sos.utilities import is_executable class Lstopo(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): @@ -16,13 +16,13 @@ class Lstopo(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): plugin_name = "lstopo" profiles = ("system", "hardware") - packages = ("hwloc-libs", ) + packages = ("hwloc-libs", "libhwloc5") def setup(self): # binary depends on particular package, both require hwloc-libs one # hwloc-gui provides lstopo command # hwloc provides lstopo-no-graphics command - if find_executable("lstopo"): + if is_executable("lstopo"): cmd = "lstopo" else: cmd = "lstopo-no-graphics" |