[lektor-619] Fixing https://github.com/lektor/lektor/issues/619, cuased by https://github.com/pypa/virtualenv/issues/1241
This commit is contained in:
parent
77f8ad4bc8
commit
408416a842
|
@ -24,7 +24,7 @@ if 1:
|
|||
import json
|
||||
import tempfile
|
||||
import shutil
|
||||
from subprocess import Popen
|
||||
from subprocess import CalledProcessError, check_output, Popen
|
||||
try:
|
||||
from urllib.request import urlopen
|
||||
except ImportError:
|
||||
|
@ -121,7 +121,10 @@ if 1:
|
|||
os.makedirs(lib_dir)
|
||||
except OSError:
|
||||
pass
|
||||
Popen([sys.executable, './virtualenv.py', lib_dir], cwd=t).wait()
|
||||
try:
|
||||
check_output([sys.executable, './src/virtualenv.py', lib_dir], cwd=t)
|
||||
except CalledProcessError: # virtualenv 16.1.0, 17+
|
||||
Popen([sys.executable, './virtualenv.py', lib_dir], cwd=t).wait()
|
||||
Popen([os.path.join(lib_dir, 'bin', 'pip'),
|
||||
'install', '--upgrade', 'Lektor']).wait()
|
||||
os.symlink(os.path.join(lib_dir, 'bin', 'lektor'),
|
||||
|
|
Loading…
Reference in New Issue