Install packages independently so they actually install

This commit is contained in:
rperper
2018-11-02 09:17:16 -04:00
parent 9b634f51e5
commit a431937d6a

View File

@@ -320,7 +320,7 @@ class preFlightsChecks:
count = 0
while (1):
if self.distro == ubuntu:
command = "apt-get -y install python-pip libcurl4-gnutls-dev libgnutls-dev libgcrypt20-dev"
command = "apt-get -y install python-pip"
else:
command = "yum -y install python-pip"
res = subprocess.call(shlex.split(command))
@@ -2971,6 +2971,15 @@ milter_default_action = accept
self.stdOut('Setup PHP error: ' + str(msg) + " [setupPHPAndComposer]", 1, 1, os.EX_OSERR)
return 0
@staticmethod
def installOne(package):
res = subprocess.call(shlex.split('apt-get -y install ' + package))
if res != 0:
preFlightsChecks.stdOut("Error #" + str(res) + ' installing:' + package + '. This may not be an issue ' \
'but may affect installation of something later', 1)
return res #Though probably not used
@staticmethod
def setupVirtualEnv(distro):
try:
@@ -2978,15 +2987,39 @@ milter_default_action = accept
##
count = 0
while (1):
if distro == centos:
command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel"
if distro == ubuntu:
# You can't install all at once! So install one at a time.
preFlightsChecks.stdOut("Installing python prerequisites", 1)
preFlightsChecks.installOne('libcurl4-gnutls-dev')
preFlightsChecks.installOne('libgnutls-dev')
preFlightsChecks.installOne('libgcrypt20-dev')
preFlightsChecks.installOne('libattr1')
preFlightsChecks.installOne('libattr1-dev')
preFlightsChecks.installOne('liblzma-dev')
preFlightsChecks.installOne('libgpgme-dev')
preFlightsChecks.installOne('libmariadbclient-dev')
preFlightsChecks.installOne('libcurl4-gnutls-dev')
preFlightsChecks.installOne('libssl-dev')
preFlightsChecks.installOne('nghttp2')
preFlightsChecks.installOne('libnghttp2-dev')
preFlightsChecks.installOne('idn2')
preFlightsChecks.installOne('libidn2-dev')
preFlightsChecks.installOne('libidn2-0-dev')
preFlightsChecks.installOne('librtmp-dev')
preFlightsChecks.installOne('libpsl-dev')
preFlightsChecks.installOne('nettle-dev')
preFlightsChecks.installOne('libgnutls28-dev')
preFlightsChecks.installOne('libldap2-dev')
preFlightsChecks.installOne('libgssapi-krb5-2')
preFlightsChecks.installOne('libk5crypto3')
preFlightsChecks.installOne('libkrb5-dev')
preFlightsChecks.installOne('libcomerr2')
preFlightsChecks.installOne('libldap2-dev')
preFlightsChecks.installOne('python-gpg')
preFlightsChecks.installOne('python-gpgme')
else:
command = 'apt-get -y install libattr1 libattr1-dev liblzma-dev libgpgme-dev ' \
'libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 ' \
'libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev ' \
'libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev ' \
'python-gpg python-gpgme'
while (1):
command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel"
res = subprocess.call(shlex.split(command))
if res == 1: