diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:22:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:22:20 +0000 |
| commit | 93fdffefe54b7e787423997ff5983d3cae105c0e (patch) | |
| tree | adb9544b0869f867ce86b84199d53ad687de480b /debian/patches | |
| parent | Merging upstream version 10.1.0+dfsg. (diff) | |
| download | ansible-93fdffefe54b7e787423997ff5983d3cae105c0e.tar.xz ansible-93fdffefe54b7e787423997ff5983d3cae105c0e.zip | |
Merging debian version 10.1.0+dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0004-fix-cyberark-conjur-import.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/0004-fix-cyberark-conjur-import.patch b/debian/patches/0004-fix-cyberark-conjur-import.patch deleted file mode 100644 index 0b5a5af1d..000000000 --- a/debian/patches/0004-fix-cyberark-conjur-import.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: fix cyberark.conjur import error -Author: Lee Garrett <debian@rocketjump.eu> -Origin: upstream, https://github.com/cyberark/ansible-conjur-collection/commit/1f1886f4f3eef61c85ef3fc1165882a7d8314533 -Forwarded: not-needed -Applied-Upstream: https://github.com/cyberark/ansible-conjur-collection/commit/1f1886f4f3eef61c85ef3fc1165882a7d8314533 -Reviewed-by: Lee Garrett <debian@rocketjump.eu> -Last-Update: 2024-06-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/ansible_collections/cyberark/conjur/plugins/lookup/conjur_variable.py -+++ b/ansible_collections/cyberark/conjur/plugins/lookup/conjur_variable.py -@@ -87,6 +87,7 @@ - - import os.path - import socket -+import ansible.module_utils.six.moves.urllib.error as urllib_error - from ansible.errors import AnsibleError - from ansible.plugins.lookup import LookupBase - from base64 import b64encode -@@ -94,7 +95,6 @@ - from os import environ - from time import sleep - from ansible.module_utils.six.moves.urllib.parse import quote --from ansible.module_utils.urls import urllib_error - from stat import S_IRUSR, S_IWUSR - from tempfile import gettempdir, NamedTemporaryFile - import yaml diff --git a/debian/patches/series b/debian/patches/series index 431ae0d5d..69c96cea0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0002-fix-libvirt-encoding-errors-on-windows-guests.patch 0003-fix-libvirt-path-resolution.patch -0004-fix-cyberark-conjur-import.patch |