diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-02-07 13:36:02 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-02-10 11:16:58 -0500 |
commit | 121da04579e4f3ce42fcead739cb75b460662bf7 (patch) | |
tree | 0cc3b9890f53589a24c3036c45872143d735bd6f /ipalib/plugins/entitle.py | |
parent | c24725ed38dd94c34e4327d1d8c5720d768dcd37 (diff) | |
download | freeipa-121da04579e4f3ce42fcead739cb75b460662bf7.tar.gz freeipa-121da04579e4f3ce42fcead739cb75b460662bf7.tar.xz freeipa-121da04579e4f3ce42fcead739cb75b460662bf7.zip |
Add the entitlement API to API.txt
It was missed because the whole module was skipped if python-rhsm wasn't
loaded.
ticket 919
Diffstat (limited to 'ipalib/plugins/entitle.py')
-rw-r--r-- | ipalib/plugins/entitle.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipalib/plugins/entitle.py b/ipalib/plugins/entitle.py index 053de7825..aeb325b6b 100644 --- a/ipalib/plugins/entitle.py +++ b/ipalib/plugins/entitle.py @@ -55,13 +55,12 @@ from ipalib import api, SkipPluginModule try: from rhsm.connection import * from rhsm.certificate import EntitlementCertificate - from ipapython import ipautil - import base64 - from ipalib.plugins.service import validate_certificate, normalize_certificate + import M2Crypto if api.env.in_server and api.env.context in ['lite', 'server']: from ipaserver.install.certs import NSS_DIR except ImportError, e: - raise SkipPluginModule(reason=str(e)) + if not api.env.validate_api: + raise SkipPluginModule(reason=str(e)) import os from ipalib import api, errors @@ -71,13 +70,15 @@ from ipalib.plugins.virtual import * from ipalib import _, ngettext from ipalib.output import Output, standard_list_of_entries from ipalib.request import context +from ipapython import ipautil import tempfile import shutil import socket +import base64 from OpenSSL import crypto -import M2Crypto from ipapython.ipautil import run from ipalib.request import context +from ipalib.plugins.service import validate_certificate, normalize_certificate import locale |