aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>2011-02-11 15:36:46 +0000
committerpcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8>2011-02-11 15:36:46 +0000
commit1ef986e54b9461604a8fb0315d44811fc4967ff7 (patch)
tree57b17937f2d6cd3117908b6e3007c6e344c7cff5
parent22f45f7596ce52f13f26ce494b4c660f292b0cae (diff)
downloadsos-1ef986e54b9461604a8fb0315d44811fc4967ff7.tar.gz
[plugins] hardware.py: handling /usr/share/rhn/up2date*client/hardware.py paths
Covers RHBZ#572353. git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1081 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--sos/plugins/hardware.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 2aabcce5..c677edce 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -13,6 +13,7 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
import sos.plugintools
+from glob import glob
class hardware(sos.plugintools.PluginBase):
"""hardware related information
@@ -36,7 +37,7 @@ class hardware(sos.plugintools.PluginBase):
"/proc/s390dbf/tape",
"/sys/bus/scsi",
"/sys/state"])
- self.collectExtOutput("/usr/share/rhn/up2dateclient/hardware.py")
+ self.collectExtOutput(glob("/usr/share/rhn/up2date*client/hardware.py")[0]) # RHBZ#572353
self.collectExtOutput("""/bin/echo -e "lspci:\n" ; /sbin/lspci ; /bin/echo -e "\nlspci -nvv:\n" ; /sbin/lspci -nvv ; /bin/echo -e "\nlspci -tv:\n" ; /sbin/lspci -tv""", suggest_filename = "lspci", root_symlink = "lspci")
self.collectExtOutput("/usr/sbin/dmidecode", root_symlink = "dmidecode")