Added cascading configuration for PKI CLI.

The PKI CLI has been modified to support cascading configuration
files: default, system-wide, and user-specific configuration.

The existing Python-based PKI CLI was moved into pki.cli.main
module. A new shell script was added as a replacement which will
read the configuration files and invoke the Python module.

1 files changed, 1 insertions, 12 deletions

diff --git a/pylint-build-scan.py b/pylint-build-scan.py
index d4156e87b..3a7b47321 100755
--- a/pylint-build-scan.py
+++ b/pylint-build-scan.py
@@ -38,7 +38,6 @@ PYLINTRC = os.path.join(SCRIPTPATH, 'dogtag.pylintrc')
 FILENAMES = [
     os.path.abspath(__file__),
     '{sitepackages}/pki',
-    '{bin}/pki-cmd',  # see HACK
     '{sbin}/pkispawn',
     '{sbin}/pkidestroy',
     '{sbin}/pki-upgrade',
@@ -130,17 +129,7 @@ def main():
     if args.verbose:
         pprint.pprint(pylint)
 
-    # HACK:
-    # pylint confuses the pki command with the pki package. We create a
-    # symlink from bin/pki to bin/pki-cmd and test bin/pki-cmd instead.
-    pki_bin = '{bin}/pki'.format(**env)
-    pki_cmd = '{bin}/pki-cmd'.format(**env)
-    os.symlink(pki_bin, pki_cmd)
-
-    try:
-        return subprocess.call(pylint, cwd=env['sitepackages'])
-    finally:
-        os.unlink(pki_cmd)
+    return subprocess.call(pylint, cwd=env['sitepackages'])
 
 if __name__ == '__main__':
     sys.exit(main())