diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2009-02-12 17:18:54 -0700 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-02-17 16:03:10 -0500 |
commit | 7e23ee7cc625d54469e184541537b3f803b6307a (patch) | |
tree | 63bb09d7fe6efe0d65204133cc602064780e690b | |
parent | 4ab133c3cb8fa9a9aff2b7e5d1c53a0feb164f3f (diff) | |
download | freeipa-7e23ee7cc625d54469e184541537b3f803b6307a.tar.gz freeipa-7e23ee7cc625d54469e184541537b3f803b6307a.tar.xz freeipa-7e23ee7cc625d54469e184541537b3f803b6307a.zip |
Removed 'Assert False' that was mistakingly left in cert.py; small cleanup in cert.py and ra.py imports
-rw-r--r-- | ipalib/plugins/cert.py | 6 | ||||
-rw-r--r-- | ipaserver/plugins/ra.py | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 96e2667b..2ccc43a7 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -23,13 +23,11 @@ Command plugins for IPA-RA certificate operations. """ from ipalib import api, SkipPluginModule - if api.env.enable_ra is not True: - raise SkipPluginModule(reason='env.enable_ra=%r' % (api.env.enable_ra,)) - + # In this case, abort loading this plugin module... + raise SkipPluginModule(reason='env.enable_ra is not True') from ipalib import Command, Str, Int -assert False class cert_request(Command): """ diff --git a/ipaserver/plugins/ra.py b/ipaserver/plugins/ra.py index 471276c3..a52909f6 100644 --- a/ipaserver/plugins/ra.py +++ b/ipaserver/plugins/ra.py @@ -32,10 +32,9 @@ certificates via the following methods: """ from ipalib import api, SkipPluginModule - if api.env.enable_ra is not True: - raise SkipPluginModule(reason='env.enable_ra=%r' % (api.env.enable_ra,)) - + # In this case, abort loading this plugin module... + raise SkipPluginModule(reason='env.enable_ra is not True') import os, stat, subprocess import array import errno @@ -44,7 +43,6 @@ from httplib import HTTPConnection from urllib import urlencode, quote from socket import gethostname import socket - from ipalib import Backend from ipalib.errors2 import NetworkError from ipaserver import servercore |