GitHub/butterfly
1
0
Fork 0
mirror of https://github.com/paradoxxxzero/butterfly.git synced 2026-05-26 07:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix login again. #96

Browse Source
This commit is contained in:
Florian Mounier
2016-02-02 10:20:46 +01:00
parent c0e2d8959b
commit c048f1a4e6
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
butterfly/terminal.py
View File

@@ -114,10 +114,13 @@ class Terminal(object):
self.communicate()
def determine_user(self):
if self.callee is None or (
tornado.options.options.unsecure and
tornado.options.options.login):
# If callee is now known and we have unsecure connection
if not tornado.options.options.unsecure:
# Secure mode we must have already a callee
assert self.callee is not None
return
# If we should login, login
if tornado.options.options.login:
user = ''
while user == '':
try:
@@ -131,13 +134,12 @@ class Terminal(object):
except Exception:
log.debug("Can't switch to user %s" % user, exc_info=True)
self.callee = utils.User(name='nobody')
elif (tornado.options.options.unsecure and not
tornado.options.options.login):
# if login is not required, we will use the same user as
# butterfly is executed
self.callee = utils.User()
return
# if login is not required, we will use the same user as
# butterfly is executed
self.callee = self.callee or utils.User()
assert self.callee is not None
def shell(self):
try: