diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2017-03-09 08:54:10 +0000 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-09 18:39:48 +0100 |
| commit | abf25d3cb6570e6ae7cd094ea6a5f4a1bd75d8a7 (patch) | |
| tree | 223031cb08cf57fac76538606ab3861105c57472 /ipapython | |
| parent | 8fb61a55fe32438752567bde8af73d6b8230a386 (diff) | |
| download | freeipa-abf25d3cb6570e6ae7cd094ea6a5f4a1bd75d8a7.tar.gz freeipa-abf25d3cb6570e6ae7cd094ea6a5f4a1bd75d8a7.tar.xz freeipa-abf25d3cb6570e6ae7cd094ea6a5f4a1bd75d8a7.zip | |
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 <mbasti@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/Makefile.am | 9 | ||||
| -rw-r--r-- | ipapython/version.py.in | 2 |
2 files changed, 9 insertions, 2 deletions
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' \ $< > $@ diff --git a/ipapython/version.py.in b/ipapython/version.py.in index 9dc9714f9..6624d9c44 100644 --- a/ipapython/version.py.in +++ b/ipapython/version.py.in @@ -49,5 +49,5 @@ API_VERSION=u'@API_VERSION@' DEFAULT_PLUGINS = frozenset(l.strip() for l in """ -__DEFAULT_PLUGINS__ +@DEFAULT_PLUGINS@ """.strip().splitlines()) |