diff options
| author | Lee Garrett <lgarrett@rocketjump.eu> | 2022-12-13 16:20:52 +0100 |
|---|---|---|
| committer | Lee Garrett <lgarrett@rocketjump.eu> | 2022-12-13 16:20:52 +0100 |
| commit | f2881f8360d2d6aa129a92f8e1a25c8d925af4f0 (patch) | |
| tree | 832e92396c17db58d91133eb5ba97c2704577c62 | |
| parent | efae9f83e31096a652df18c7a967e725a2ae6189 (diff) | |
| download | debian-ansible-core-f2881f8360d2d6aa129a92f8e1a25c8d925af4f0.zip | |
Fix hardcoded call to python binary
This is preparation for the ansible-doc package.
Has been merged upstream:
https://github.com/ansible/ansible/pull/79520
| -rw-r--r-- | debian/patches/0005-use-py3.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/0005-use-py3.patch b/debian/patches/0005-use-py3.patch index 057ad5c7..cc046fe6 100644 --- a/debian/patches/0005-use-py3.patch +++ b/debian/patches/0005-use-py3.patch @@ -261,3 +261,23 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ GENERATE_CLI = hacking/build-ansible.py generate-man # fetch version from project release.py as single source-of-truth +--- a/docs/docsite/Makefile ++++ b/docs/docsite/Makefile +@@ -44,7 +44,7 @@ + + DOC_PLUGINS ?= become cache callback cliconf connection httpapi inventory lookup netconf shell strategy vars + +-PYTHON ?= python ++PYTHON ?= python3 + # fetch version from project release.py as single source-of-truth + VERSION := $(shell $(PYTHON) ../../packaging/release/versionhelper/version_helper.py --raw || echo error) + ifeq ($(findstring error,$(VERSION)), error) +@@ -82,7 +82,7 @@ + ansible_structure: + # We must have python and python-packaging for the version_helper + # script so use it for version comparison +- if python -c "import sys, packaging.version as p; sys.exit(not p.Version('$(MAJOR_VERSION)') > p.Version('2.10'))" ; then \ ++ if $(PYTHON) -c "import sys, packaging.version as p; sys.exit(not p.Version('$(MAJOR_VERSION)') > p.Version('2.10'))" ; then \ + echo "Creating symlinks in ansible_structure"; \ + ln -sf ../rst/ansible_index.rst rst/index.rst; \ + ln -sf ../dev_guide/ansible_index.rst rst/dev_guide/index.rst; \ |