Made configuring slightly saner (it's now called directly from main, instead of surprisingly via connect())
This commit is contained in:
parent
82be7b1020
commit
2890a04f71
|
@ -6,10 +6,15 @@ from ceo import ldapi, members, library
|
|||
|
||||
def start():
|
||||
try:
|
||||
print "Reading config file...",
|
||||
#XXX this should really all be done through one big config file
|
||||
members.configure()
|
||||
library.configure()
|
||||
print "read."
|
||||
|
||||
print "Connecting to LDAP...",
|
||||
library.configure()
|
||||
members.connect(AuthCallback())
|
||||
print "connected"
|
||||
print "connected."
|
||||
|
||||
if len(sys.argv) == 1:
|
||||
ceo.urwid.main.start()
|
||||
|
|
|
@ -87,7 +87,6 @@ ld = None
|
|||
def connect(auth_callback):
|
||||
"""Connect to LDAP."""
|
||||
|
||||
configure()
|
||||
|
||||
global ld
|
||||
password = None
|
||||
|
|
Loading…
Reference in New Issue