summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipaclient/install/client.py2
-rw-r--r--ipaplatform/base/paths.py1
-rw-r--r--ipapython/ipautil.py2
3 files changed, 2 insertions, 3 deletions
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index d18d8bb1f..410201606 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -1083,7 +1083,7 @@ def configure_sshd_config(fstore, options):
)
for candidate in candidates:
- args = ['sshd', '-t', '-f', paths.DEV_NULL]
+ args = ['sshd', '-t', '-f', os.devnull]
for item in candidate.items():
args.append('-o')
args.append('%s=%s' % item)
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index a30e6b33b..d4f7e8a66 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -33,7 +33,6 @@ class BasePathNamespace(object):
SYSTEMCTL = "/bin/systemctl"
TAR = "/bin/tar"
BIN_TRUE = "/bin/true"
- DEV_NULL = "/dev/null"
DEV_STDIN = "/dev/stdin"
AUTOFS_LDAP_AUTH_CONF = "/etc/autofs_ldap_auth.conf"
ETC_DIRSRV = "/etc/dirsrv"
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 472ba3596..fcb2e3500 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -413,7 +413,7 @@ def run(args, stdin=None, raiseonerr=True, nolog=(), env=None,
if stdin:
p_in = subprocess.PIPE
if skip_output:
- p_out = p_err = open(paths.DEV_NULL, 'w')
+ p_out = p_err = open(os.devnull, 'w')
elif redirect_output:
p_out = sys.stdout
p_err = sys.stderr