diff options
| author | Lee Garrett <lgarrett@rocketjump.eu> | 2022-06-14 01:15:52 +0200 |
|---|---|---|
| committer | Lee Garrett <lgarrett@rocketjump.eu> | 2022-06-14 16:06:09 +0200 |
| commit | 4fd7fcf2097dbdbccc4669335012dc4bfaba1f62 (patch) | |
| tree | ffc19121b3da8ece039bb95ad8ee1bd272975bb6 | |
| parent | 13a0ce61e28cacaf5a7ca83f7b8ce0a2ecafc603 (diff) | |
| download | debian-ansible-core-4fd7fcf2097dbdbccc4669335012dc4bfaba1f62.zip | |
Refresh Debian patches
| -rw-r--r-- | debian/patches/0005-use-py3.patch | 37 | ||||
| -rw-r--r-- | debian/patches/0007-use-C.UTF-8.patch | 2 |
2 files changed, 12 insertions, 27 deletions
diff --git a/debian/patches/0005-use-py3.patch b/debian/patches/0005-use-py3.patch index 80451c11..057ad5c7 100644 --- a/debian/patches/0005-use-py3.patch +++ b/debian/patches/0005-use-py3.patch @@ -16,14 +16,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ # To run this script, first make webdocs in the toplevel of the checkout. This will generate all # rst files from their sources. Then run this script ./docs/bin/find-plugin-refs.py ---- a/lib/ansible/cli/scripts/ansible_cli_stub.py -+++ b/lib/ansible/cli/scripts/ansible_cli_stub.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # --- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py +++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py @@ -1,4 +1,4 @@ @@ -242,24 +234,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ assert set(inv['_meta']['hostvars']['test_host']['departments']) == set(['paris'])" export ANSIBLE_CACHE_PLUGINS=cache_plugins/ ---- a/docs/docsite/Makefile -+++ b/docs/docsite/Makefile -@@ -1,5 +1,5 @@ - OS := $(shell uname -s) --SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"): -+SITELIB = $(shell python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"): - PLUGIN_FORMATTER=../../hacking/build-ansible.py docs-build - TESTING_FORMATTER=../bin/testing_formatter.sh - KEYWORD_DUMPER=../../hacking/build-ansible.py document-keywords -@@ -45,7 +45,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) --- a/test/units/modules/test_async_wrapper.py +++ b/test/units/modules/test_async_wrapper.py @@ -22,11 +22,11 @@ @@ -276,3 +250,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 'import sys', 'sys.stderr.write("stderr stuff")', "print('%s')" % json.dumps(module_result) +--- a/Makefile ++++ b/Makefile +@@ -26,7 +26,7 @@ + ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1 + endif + +-PYTHON ?= python ++PYTHON ?= python3 + GENERATE_CLI = hacking/build-ansible.py generate-man + + # fetch version from project release.py as single source-of-truth diff --git a/debian/patches/0007-use-C.UTF-8.patch b/debian/patches/0007-use-C.UTF-8.patch index c4b3a8f7..9408738e 100644 --- a/debian/patches/0007-use-C.UTF-8.patch +++ b/debian/patches/0007-use-C.UTF-8.patch @@ -7,7 +7,7 @@ Last-Update: 2021-11-05 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/test/lib/ansible_test/_internal/util.py +++ b/test/lib/ansible_test/_internal/util.py -@@ -344,7 +344,7 @@ +@@ -350,7 +350,7 @@ def common_environment(): """Common environment used for executing all programs.""" env = dict( |