Blame SOURCES/0013-Issue-50824-dsctl-remove-fails-with-name-ensure_str-.patch
|
 |
8394b4 |
From 5f3f69533a2298cc0f2b45e17184c479b0708687 Mon Sep 17 00:00:00 2001
|
|
|
8394b4 |
From: Matus Honek <mhonek@redhat.com>
|
|
|
8394b4 |
Date: Thu, 16 Jan 2020 12:21:45 +0100
|
|
|
8394b4 |
Subject: [PATCH] Issue 50824 - dsctl remove fails with "name 'ensure_str' is
|
|
|
8394b4 |
not defined"
|
|
|
8394b4 |
|
|
|
8394b4 |
Bug Description:
|
|
|
8394b4 |
Missing import since commit c39c7bb.
|
|
|
8394b4 |
|
|
|
8394b4 |
Fix Description:
|
|
|
8394b4 |
Add the import.
|
|
|
8394b4 |
|
|
|
8394b4 |
Fixes https://pagure.io/389-ds-base/issue/50824
|
|
|
8394b4 |
|
|
|
8394b4 |
Author: Matus Honek <mhonek@redhat.com>
|
|
|
8394b4 |
|
|
|
8394b4 |
Review by: Mark (thanks!)
|
|
|
8394b4 |
|
|
|
8394b4 |
(cherry picked from commit 4f9aafca9a9927812da5e37ce71d79d1fd23b25a)
|
|
|
8394b4 |
---
|
|
|
8394b4 |
src/lib389/lib389/instance/remove.py | 2 +-
|
|
|
8394b4 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
8394b4 |
|
|
|
8394b4 |
diff --git a/src/lib389/lib389/instance/remove.py b/src/lib389/lib389/instance/remove.py
|
|
|
8394b4 |
index 7a69da514..77f5a45f7 100644
|
|
|
8394b4 |
--- a/src/lib389/lib389/instance/remove.py
|
|
|
8394b4 |
+++ b/src/lib389/lib389/instance/remove.py
|
|
|
8394b4 |
@@ -11,7 +11,7 @@ import shutil
|
|
|
8394b4 |
import subprocess
|
|
|
8394b4 |
import logging
|
|
|
8394b4 |
from lib389.nss_ssl import NssSsl
|
|
|
8394b4 |
-from lib389.utils import selinux_label_port, assert_c, ensure_list_str
|
|
|
8394b4 |
+from lib389.utils import selinux_label_port, assert_c, ensure_str, ensure_list_str
|
|
|
8394b4 |
|
|
|
8394b4 |
|
|
|
8394b4 |
######################## WARNING #############################
|
|
|
8394b4 |
--
|
|
|
8394b4 |
2.21.1
|
|
|
8394b4 |
|