From 604ea19cf89f96d71631ee162067a17ca79967a1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jan 16 2020 00:02:14 +0000 Subject: Add patch file for last commit Yes, I missed a bit from a patch to fix a missing bit, I am aware of the irony --- diff --git a/0001-Issue-50798-incorrect-bytes-in-format-string-fix-imp.patch b/0001-Issue-50798-incorrect-bytes-in-format-string-fix-imp.patch new file mode 100644 index 0000000..755016c --- /dev/null +++ b/0001-Issue-50798-incorrect-bytes-in-format-string-fix-imp.patch @@ -0,0 +1,45 @@ +From 828aad0769cee2c58e073ac446558cc614ed7a96 Mon Sep 17 00:00:00 2001 +From: Mark Reynolds +Date: Mon, 13 Jan 2020 17:17:40 -0500 +Subject: [PATCH] Issue 50798 - incorrect bytes in format string(fix import + issue) + +Description: The previous commit did not import ensure_list_str() from + utils.py + +relates: https://pagure.io/389-ds-base/issue/50798 + +Reviewed by: mreynolds (one line commit rule) +--- + src/lib389/lib389/instance/remove.py | 2 +- + src/lib389/lib389/instance/setup.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lib389/lib389/instance/remove.py b/src/lib389/lib389/instance/remove.py +index 41eaeb4a6..e54e64e5c 100644 +--- a/src/lib389/lib389/instance/remove.py ++++ b/src/lib389/lib389/instance/remove.py +@@ -11,7 +11,7 @@ import shutil + import subprocess + import logging + from lib389.nss_ssl import NssSsl +-from lib389.utils import selinux_label_port, assert_c ++from lib389.utils import selinux_label_port, assert_c, ensure_list_str + + + ######################## WARNING ############################# +diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py +index ead3db1b6..6ee71b5d0 100644 +--- a/src/lib389/lib389/instance/setup.py ++++ b/src/lib389/lib389/instance/setup.py +@@ -33,6 +33,7 @@ from lib389.utils import ( + assert_c, + is_a_dn, + ensure_str, ++ ensure_list_str, + normalizeDN, + socket_check_open, + selinux_label_port, +-- +2.24.1 +