From 1b15a70ddda3c0f12124a1f53398cc09412981bf Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Fri, 20 Feb 2015 14:57:37 +0000 Subject: Revert "[build] install sos.conf from setup.py" This reverts commit edd516836e1070df6c95bd2d71e6b82feaa10a11. It turns out installing things to /etc from setup.py is a terrible idea; distutils deliberately makes this difficult (by design) and expects you to either use data resources (installed under /usr on *nix platforms) or provide a script or other means to set up the configuration post-install[1][2]. Instead revert to simply installing the python code and docs via setup.py and allow distribution packagers to handle the config file installation as they choose. [1] http://stackoverflow.com/questions/10456279/python-setuptools [2] http://stackoverflow.com/questions/3325606/how-to-handle-conf Signed-off-by: Bryn M. Reeves --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 6b03a499..2064db3f 100644 --- a/setup.py +++ b/setup.py @@ -64,9 +64,7 @@ setup(name='sosreport', data_files=[ ('share/man/man1', ['man/en/sosreport.1']), ('share/man/man5', ['man/en/sos.conf.5']), - # FIXME - does not support --prefix - ('/etc', ['sos.conf']) - ], + ], packages=['sos', 'sos.plugins', 'sos.policies'], cmdclass={'build': BuildData, 'install_data': InstallData}, requires=['six'], -- cgit