Merge branch 'develop' of git://github.com/lukeroge/CloudBot into develop

This commit is contained in:
neersighted 2012-02-29 19:53:49 -08:00
commit 676222b5f9

View file

@ -42,7 +42,7 @@ except (subprocess.CalledProcessError), e:
screen = re.match(r'^/usr/bin/screen$', screencheck) screen = re.match(r'^/usr/bin/screen$', screencheck)
if os.path.isfile("./config"): if os.path.isfile("./config"):
backend = config.get("wrapper", {}).get("backend", "daemon") backend = config.get("wrapper", {}).get("backend", "daemon")
else else:
backend = daemon backend = daemon
try: try: