|
 |
604ea19 |
From 828aad0769cee2c58e073ac446558cc614ed7a96 Mon Sep 17 00:00:00 2001
|
|
|
604ea19 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
604ea19 |
Date: Mon, 13 Jan 2020 17:17:40 -0500
|
|
|
604ea19 |
Subject: [PATCH] Issue 50798 - incorrect bytes in format string(fix import
|
|
|
604ea19 |
issue)
|
|
|
604ea19 |
|
|
|
604ea19 |
Description: The previous commit did not import ensure_list_str() from
|
|
|
604ea19 |
utils.py
|
|
|
604ea19 |
|
|
|
604ea19 |
relates: https://pagure.io/389-ds-base/issue/50798
|
|
|
604ea19 |
|
|
|
604ea19 |
Reviewed by: mreynolds (one line commit rule)
|
|
|
604ea19 |
---
|
|
|
604ea19 |
src/lib389/lib389/instance/remove.py | 2 +-
|
|
|
604ea19 |
src/lib389/lib389/instance/setup.py | 1 +
|
|
|
604ea19 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
604ea19 |
|
|
|
604ea19 |
diff --git a/src/lib389/lib389/instance/remove.py b/src/lib389/lib389/instance/remove.py
|
|
|
604ea19 |
index 41eaeb4a6..e54e64e5c 100644
|
|
|
604ea19 |
--- a/src/lib389/lib389/instance/remove.py
|
|
|
604ea19 |
+++ b/src/lib389/lib389/instance/remove.py
|
|
|
604ea19 |
@@ -11,7 +11,7 @@ import shutil
|
|
|
604ea19 |
import subprocess
|
|
|
604ea19 |
import logging
|
|
|
604ea19 |
from lib389.nss_ssl import NssSsl
|
|
|
604ea19 |
-from lib389.utils import selinux_label_port, assert_c
|
|
|
604ea19 |
+from lib389.utils import selinux_label_port, assert_c, ensure_list_str
|
|
|
604ea19 |
|
|
|
604ea19 |
|
|
|
604ea19 |
######################## WARNING #############################
|
|
|
604ea19 |
diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
|
|
|
604ea19 |
index ead3db1b6..6ee71b5d0 100644
|
|
|
604ea19 |
--- a/src/lib389/lib389/instance/setup.py
|
|
|
604ea19 |
+++ b/src/lib389/lib389/instance/setup.py
|
|
|
604ea19 |
@@ -33,6 +33,7 @@ from lib389.utils import (
|
|
|
604ea19 |
assert_c,
|
|
|
604ea19 |
is_a_dn,
|
|
|
604ea19 |
ensure_str,
|
|
|
604ea19 |
+ ensure_list_str,
|
|
|
604ea19 |
normalizeDN,
|
|
|
604ea19 |
socket_check_open,
|
|
|
604ea19 |
selinux_label_port,
|
|
|
604ea19 |
--
|
|
|
604ea19 |
2.24.1
|
|
|
604ea19 |
|