diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-03-29 15:57:11 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-03-29 15:57:11 -0400 |
| commit | 23d89280bdf6bf4c341478eb766dba9d4f395708 (patch) | |
| tree | 315fd25830cc260c61d1c943cc17c8180d8327db | |
| parent | 64e0a05d0fcb2c1e3c27a6ab076ecc8b571efd21 (diff) | |
| download | systemtap-steved-23d89280bdf6bf4c341478eb766dba9d4f395708.tar.gz systemtap-steved-23d89280bdf6bf4c341478eb766dba9d4f395708.tar.xz systemtap-steved-23d89280bdf6bf4c341478eb766dba9d4f395708.zip | |
tweak "Distro:" line generation in testsuite logs, to moot "oracle-enterprise.patch"
| -rw-r--r-- | testsuite/lib/systemtap.exp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index c80ad171..b9db4e40 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -151,10 +151,9 @@ proc get_system_info {} { set Snapshot $version } set Distro "Linux" - if [file exists /etc/fedora-release] {set Distro [exec /bin/cat /etc/fedora-release]} - if [file exists /etc/redhat-release] {set Distro [exec /bin/cat /etc/redhat-release]} - if [file exists /etc/suse-release] {set Distro [exec /bin/cat /etc/suse-release]} - if [file exists /etc/debian_version] {set Distro [exec /bin/cat /etc/debian_version]} + foreach f {/etc/fedora-release /etc/enterprise-release /etc/redhat-release /etc/suse-release /etc/debian_version} { + if [file exists $f] then {set Distro [exec /bin/cat $f]; break } + } } if {! [setup_systemtap_environment]} then { |