2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00

python: Don't install ovs-flowviz.conf as a global data.

Specifying data_files makes setuptools install this file to a global
sys.prefix.  So, it ends up in both the main directory of the python
package and in the /usr/ovs-flowviz.conf, which is not good:

 warning: install_data: setup script did not provide a directory for
          'ovs/flowviz/ovs-flowviz.conf' -- installing right in
          'build/bdist.linux-x86_64/wheel/ovs-3.4.90.data/data'
 adding 'ovs-3.4.90.data/data/ovs-flowviz.conf'

There is no real point installing this file globally, just use the
package_data to ensure it is included in the python package.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
Reviewed-by: Adrian Moreno <amorenoz@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Ilya Maximets
2024-10-21 21:23:55 +02:00
parent 0256ee64ed
commit e263708898

View File

@@ -109,8 +109,7 @@ setup_args = dict(
[*flow_extras_require, 'click', 'rich', 'graphviz'],
},
scripts=["ovs/flowviz/ovs-flowviz"],
data_files=["ovs/flowviz/ovs-flowviz.conf"],
include_package_data=True,
package_data={'ovs.flowviz': ['ovs-flowviz.conf']},
)
try: