Resolves issue where CEO would not start

This commit is contained in:
Zachary Seguin 2016-02-20 00:10:06 -05:00
parent 4b0db35899
commit 44db85fe2f
3 changed files with 26 additions and 4 deletions

View File

@ -4,14 +4,13 @@ import sys, ldap
from getpass import getpass from getpass import getpass
import ceo.urwid.main import ceo.urwid.main
import ceo.console.main import ceo.console.main
from ceo import ldapi, members, library from ceo import ldapi, members
def start(): def start():
try: try:
if len(sys.argv) == 1: if len(sys.argv) == 1:
print "Reading config file...", print "Reading config file...",
members.configure() members.configure()
library.configure()
print "Connecting to LDAP..." print "Connecting to LDAP..."
members.connect(AuthCallback()) members.connect(AuthCallback())
@ -19,7 +18,6 @@ def start():
ceo.urwid.main.start() ceo.urwid.main.start()
else: else:
members.configure() members.configure()
library.configure()
members.connect(AuthCallback()) members.connect(AuthCallback())
ceo.console.main.start() ceo.console.main.start()
except ldap.LOCAL_ERROR, e: except ldap.LOCAL_ERROR, e:

24
debian/changelog vendored
View File

@ -1,3 +1,27 @@
ceo (0.5.27trusty1) trusty; urgency=high
* Resolved issue from previous release which resulted in CEO not launching
-- Zachary Seguin <ztseguin@csclub.uwaterloo.ca> Fri, 19 Feb 2016 23:38:41 -0500
ceo (0.5.27jessie1) jessie; urgency=high
* Resolved issue from previous release which resulted in CEO not launching
-- Zachary Seguin <ztseguin@csclub.uwaterloo.ca> Fri, 19 Feb 2016 23:38:41 -0500
ceo (0.5.27jessie) jessie; urgency=medium
* "Library" now launches "librarian"
-- Felix Bauckholt <fbauckho@csclub.uwaterloo.ca> Fri, 19 Feb 2016 22:12:25 -0500
ceo (0.5.26trusty) trusty; urgency=medium
* "Library" now launches "librarian"
-- Felix Bauckholt <fbauckho@csclub.uwaterloo.ca> Fri, 19 Feb 2016 22:07:37 -0500
ceo (0.5.26) jessie; urgency=medium ceo (0.5.26) jessie; urgency=medium
* Repackage for jessie * Repackage for jessie

2
debian/control vendored
View File

@ -22,7 +22,7 @@ Package: ceo-python
Architecture: all Architecture: all
Replaces: ceo-gui Replaces: ceo-gui
Conflicts: ceo-gui Conflicts: ceo-gui
Depends: ceo-clients, python-ldap, python-urwid, python-sqlobject, python-protobuf, python-psycopg | python-psycopg2, python-mysqldb, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Depends: ceo-clients, library, python-ldap, python-urwid, python-sqlobject, python-protobuf, python-psycopg | python-psycopg2, python-mysqldb, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Description: Computer Science Club Administrative GUI Description: Computer Science Club Administrative GUI
This package contains the CSC Electronic Office This package contains the CSC Electronic Office
graphical user interface. graphical user interface.