From abf25d3cb6570e6ae7cd094ea6a5f4a1bd75d8a7 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Thu, 9 Mar 2017 08:54:10 +0000 Subject: ipapython: fix DEFAULT_PLUGINS in version.py Replace the placeholder with the actual value during build. This fixes the client incorrectly assuming that the default version of all plugins is 1. https://pagure.io/freeipa/issue/6597 Reviewed-By: Martin Basti --- ipapython/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ipapython/Makefile.am') diff --git a/ipapython/Makefile.am b/ipapython/Makefile.am index 19388680b..7038e8b57 100644 --- a/ipapython/Makefile.am +++ b/ipapython/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Makefile.python.am +MOSTLYCLEANFILES = .DEFAULT_PLUGINS + EXTRA_DIST = version.py.in all-local: version.py @@ -7,10 +9,15 @@ dist-hook: version.py install-exec-local: version.py bdist_wheel: version.py -version.py: version.py.in $(top_builddir)/$(CONFIG_STATUS) +.DEFAULT_PLUGINS: $(top_srcdir)/API.txt + $(AM_V_GEN)awk '$$1 == "default:" { print $$2 }' $< >$@ + +version.py: version.py.in .DEFAULT_PLUGINS $(top_builddir)/$(CONFIG_STATUS) $(AM_V_GEN)sed \ -e 's|@API_VERSION[@]|$(API_VERSION)|g' \ -e 's|@NUM_VERSION[@]|$(NUM_VERSION)|g' \ -e 's|@VERSION[@]|$(VERSION)|g' \ -e 's|@VENDOR_SUFFIX[@]|$(VENDOR_SUFFIX)|g' \ + -e '/@DEFAULT_PLUGINS[@]/r .DEFAULT_PLUGINS' \ + -e '/@DEFAULT_PLUGINS[@]/d' \ $< > $@ -- cgit