diff --git a/install/install.py b/install/install.py index 74b5afb0953e7bd5c79a2ee5aa1c7c0d9bb8acb8..70dcb2b78f455a7a091a72341c91197f9d25feb1 100644 --- a/install/install.py +++ b/install/install.py @@ -126,7 +126,7 @@ class PreSetup(object): smtp.quit() return True - except (SMTPAuthenticationError, socket.timeout), e: + except (SMTPAuthenticationError, socket.timeout, socket.gaierror), e: color_print(e, 'red') return False diff --git a/install/next.py b/install/next.py index 8f53b92ebc5cba0a2e857f6ee5beb65387d9708a..95ad3bc1b0200ea233a5a8dab147db97bddaaad6 100644 --- a/install/next.py +++ b/install/next.py @@ -57,6 +57,7 @@ class Setup(object): def start(self): print "开始安装Jumpserver, è¦æ±‚环境为 CentOS 6.5 x86_64" self._sync_db() + self._input_admin() self._create_admin()