diff options
Diffstat (limited to 'base/server/sbin')
| -rw-r--r-- | base/server/sbin/pki-server | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/base/server/sbin/pki-server b/base/server/sbin/pki-server index c730ebd20..2fb41bd14 100644 --- a/base/server/sbin/pki-server +++ b/base/server/sbin/pki-server @@ -25,6 +25,7 @@ import sys import pki.cli import pki.server.cli.instance import pki.server.cli.subsystem +import pki.server.cli.migrate class PKIServerCLI(pki.cli.CLI): @@ -34,6 +35,7 @@ class PKIServerCLI(pki.cli.CLI): self.add_module(pki.server.cli.instance.InstanceCLI()) self.add_module(pki.server.cli.subsystem.SubsystemCLI()) + self.add_module(pki.server.cli.migrate.MigrateCLI()) def get_full_module_name(self, module_name): return module_name @@ -43,6 +45,7 @@ class PKIServerCLI(pki.cli.CLI): print 'Usage: pki-server [OPTIONS]' print print ' -v, --verbose Run in verbose mode.' + print ' --debug Show debug messages.' print ' --help Show help message.' print @@ -52,7 +55,7 @@ class PKIServerCLI(pki.cli.CLI): try: opts, args = getopt.getopt(argv[1:], 'v', [ - 'verbose', 'help']) + 'verbose', 'debug', 'help']) except getopt.GetoptError as e: print 'ERROR: ' + str(e) @@ -61,7 +64,11 @@ class PKIServerCLI(pki.cli.CLI): for o, _ in opts: if o in ('-v', '--verbose'): - self.verbose = True + self.set_verbose(True) + + elif o == '--debug': + self.set_verbose(True) + self.set_debug(True) elif o == '--help': self.print_help() @@ -80,5 +87,4 @@ class PKIServerCLI(pki.cli.CLI): if __name__ == '__main__': cli = PKIServerCLI() - cli.init() cli.execute(sys.argv) |