summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/httpinstance.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-08-11 17:08:09 -0400
committerRob Crittenden <rcritten@redhat.com>2009-08-12 13:18:15 -0400
commit8780751330871033b13fc8fbb7eb0588baf4417d (patch)
tree0b21cac0974b193c67c43e22fb7b21983766fbf8 /ipaserver/install/httpinstance.py
parentc781e8a57d3d05fa07729dbccff07bc1fab9d8e8 (diff)
downloadfreeipa-8780751330871033b13fc8fbb7eb0588baf4417d.zip
freeipa-8780751330871033b13fc8fbb7eb0588baf4417d.tar.gz
freeipa-8780751330871033b13fc8fbb7eb0588baf4417d.tar.xz
Clean up some problems discovered with pylint and pychecker
Much of this is formatting to make pylint happy but it also fixes some real bugs.
Diffstat (limited to 'ipaserver/install/httpinstance.py')
-rw-r--r--ipaserver/install/httpinstance.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index ba9de61..b6483fb 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -19,13 +19,9 @@
import os
import os.path
-import subprocess
-import string
import tempfile
import logging
import pwd
-import fileinput
-import sys
import shutil
import service
@@ -105,8 +101,8 @@ class HTTPInstance(service.Service):
if selinux:
try:
# returns e.g. "httpd_can_network_connect --> off"
- (stdout, stderr) = ipautils.run(["/usr/sbin/getsebool",
- "httpd_can_network_connect"])
+ (stdout, stderr) = ipautil.run(["/usr/sbin/getsebool",
+ "httpd_can_network_connect"])
self.backup_state("httpd_can_network_connect", stdout.split()[2])
except:
pass
@@ -170,7 +166,7 @@ class HTTPInstance(service.Service):
db.create_from_pkcs12(self.pkcs12_info[0], self.pkcs12_info[1], passwd="")
server_certs = db.find_server_certs()
if len(server_certs) == 0:
- raise RuntimeError("Could not find a suitable server cert in import in %s" % pkcs12_info[0])
+ raise RuntimeError("Could not find a suitable server cert in import in %s" % self.pkcs12_info[0])
db.create_password_conf()
# We only handle one server cert