Merge branch 'sh'

connect.py

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

install/install.py

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