github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'sh'

pull/71/head
ibuler 2015-12-31 16:42:21 +08:00
parent 2e2b065c42 5e86b06db8
commit 7e185197aa
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connect.py
View File

@ -800,7 +800,9 @@ def main():
color_print('请输入正确ID', 'red') color_print('请输入正确ID', 'red')
except ServerError, e: except ServerError, e:
color_print(e, 'red') color_print(e, 'red')
except IndexError: except Exception, e:
color_print(e)
time.sleep(5)
pass pass
if __name__ == '__main__': if __name__ == '__main__':

5
install/install.py
View File

@ -127,8 +127,11 @@ class PreSetup(object):
smtp.quit() smtp.quit()
return True return True
except (SMTPAuthenticationError, socket.timeout, socket.gaierror, SMTPSenderRefused, SMTPConnectError), e: except Exception, e:
color_print(e, 'red') color_print(e, 'red')
skip = raw_input('是否跳过(y/n) [n]? : ')
if skip == 'y':
return True
return False return False
@staticmethod @staticmethod