aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-01-03 10:05:30 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-01-03 10:21:23 -0800
commit767eef2583f7282f8215279d6f725508dd277a63 (patch)
treef10f867af2c09616a58f57ff84d5ca0c3b017bd4 /gkeys-ldap
parentMigrate all pkgs to using a complete Action_Map dictionary (diff)
downloadgentoo-keys-767eef2583f7282f8215279d6f725508dd277a63.tar.gz
gentoo-keys-767eef2583f7282f8215279d6f725508dd277a63.tar.bz2
gentoo-keys-767eef2583f7282f8215279d6f725508dd277a63.zip
cli.py: Remove redundant code
Diffstat (limited to 'gkeys-ldap')
-rw-r--r--gkeys-ldap/gkeyldap/cli.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py
index b4a9904..d0f57cf 100644
--- a/gkeys-ldap/gkeyldap/cli.py
+++ b/gkeys-ldap/gkeyldap/cli.py
@@ -47,7 +47,11 @@ class Main(CliBase):
Defaults to sys.argv[1:]
"""
if args:
- return self.run(self.parse_args(args))
+ ok = self.setup(args, [])
else:
- return self.run(self.parse_args(sys.argv[1:]))
+ args = self.parse_args(sys.argv[1:])
+ ok = self.setup(args, os.path.join(self.config['configdir'],'gkeys.conf'))
+ if ok:
+ return self.run(args)
+ return False