Merge branch 'dev'

2016-04-05 16:53:06 +08:00 · 2016-04-05 16:53:06 +08:00 · d20fecadac
parent f511802db5 fa430bf104
commit d20fecadac
1 changed files with 1 additions and 0 deletions
--- a/install/install.py
+++ b/install/install.py
@ -238,6 +238,7 @@ class PreSetup(object):
    def _require_pip(self):
        color_print('开始安装依赖pip包', 'green')
        bash('pip uninstall -y pycrypto')
+        bash('rm -rf /usr/lib64/python2.6/site-packages/Crypto/')
        ret_code = bash('pip install -r requirements.txt')
        self.check_bash_return(ret_code, "安装JumpServer 依赖的python库失败！")