Merge branch 'master' into warnings-are-errors

This commit is contained in:
Erica Portnoy
2018-11-27 17:18:55 -08:00
7 changed files with 52 additions and 10 deletions
+1 -2
View File
@@ -593,8 +593,7 @@ BootstrapArchCommon() {
# - ArchLinux (x86_64)
#
# "python-virtualenv" is Python3, but "python2-virtualenv" provides
# only "virtualenv2" binary, not "virtualenv" necessary in
# ./tools/_venv_common.py
# only "virtualenv2" binary, not "virtualenv".
deps="
python2
@@ -7,8 +7,7 @@ BootstrapArchCommon() {
# - ArchLinux (x86_64)
#
# "python-virtualenv" is Python3, but "python2-virtualenv" provides
# only "virtualenv2" binary, not "virtualenv" necessary in
# ./tools/_venv_common.py
# only "virtualenv2" binary, not "virtualenv".
deps="
python2