From 398619791239e13a0c3c74921e1ab7599e5fd5ba Mon Sep 17 00:00:00 2001 From: James Laska Date: Thu, 14 Aug 2014 09:17:35 -0400 Subject: [PATCH] Create packaging symlinks for sosreport --- setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index ffa632b3d8..484f537f2d 100755 --- a/setup.py +++ b/setup.py @@ -22,16 +22,17 @@ munin_plugin_conf_path = "/etc/munin/plugin-conf.d" if os.path.exists("/etc/debian_version"): sysinit = "/etc/init.d" webconfig = "/etc/apache2/conf.d" - sosconfig = "/usr/share/sosreport/sos/plugins" shutil.copy("config/awx-munin-ubuntu.conf", "config/awx-munin.conf") + # sosreport-3.1 (and newer) look in '/usr/share/sosreport/sos/plugins' + # sosreport-3.0 looks in '/usr/lib/python2.7/dist-packages/sos/plugins' + # debian/.links will create symlinks to support both versions + sosconfig = "/usr/share/sosreport/sos/plugins" else: sysinit = "/etc/rc.d/init.d" webconfig = "/etc/httpd/conf.d" - if os.path.exists("/usr/lib/python2.7/site-packages"): - sosconfig = "/usr/lib/python2.7/site-packages/sos/plugins" - else: - sosconfig = "/usr/lib/python2.6/site-packages/sos/plugins" shutil.copy("config/awx-munin-el.conf", "config/awx-munin.conf") + # The .spec will create symlinks to support multiple versions of sosreport + sosconfig = "/usr/share/sosreport/sos/plugins" ##################################################################### # Helper Functions