Hello Dduvall, Gergő Tisza, jenkins-bot, Ejegg, I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/394828 to review the following change. Change subject: Revert "Replace libmysqlclient-dev with default-libmysqlclient-dev" ...................................................................... Revert "Replace libmysqlclient-dev with default-libmysqlclient-dev" This reverts commit f513150385f85ad10cdc427b6f55131a6ceda615. Change-Id: I30207cd19b4a242dc409c7de6eb4c6254ec9509b --- M puppet/modules/crm/manifests/tools.pp M puppet/modules/eventlogging/manifests/init.pp M puppet/modules/role/manifests/striker.pp M puppet/modules/sentry/manifests/init.pp 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/28/394828/1 diff --git a/puppet/modules/crm/manifests/tools.pp b/puppet/modules/crm/manifests/tools.pp index 17c7aab..6d70d79 100644 --- a/puppet/modules/crm/manifests/tools.pp +++ b/puppet/modules/crm/manifests/tools.pp @@ -15,7 +15,7 @@ $audit_base = '/var/spool/audit' require_package( - 'default-libmysqlclient-dev', + 'libmysqlclient-dev', 'libyaml-dev' ) @@ -50,7 +50,7 @@ command => "pip install -r ${dir}/requirements.txt", require => [ Git::Clone['wikimedia/fundraising/tools'], - Package['default-libmysqlclient-dev'], + Package['libmysqlclient-dev'], Package['libyaml-dev'], ], } diff --git a/puppet/modules/eventlogging/manifests/init.pp b/puppet/modules/eventlogging/manifests/init.pp index d205fbc..d04985e 100644 --- a/puppet/modules/eventlogging/manifests/init.pp +++ b/puppet/modules/eventlogging/manifests/init.pp @@ -15,7 +15,7 @@ require => Git::Clone['eventlogging'], } - require_package('default-libmysqlclient-dev') + require_package('libmysqlclient-dev') require_package('librdkafka-dev') # Do the initial pip install into the virtualenv @@ -25,7 +25,7 @@ creates => "${path}/virtualenv/local/lib/python2.7/site-packages/eventlogging.egg-link", require => [ Service::Gitupdate['eventlogging'], - Package['default-libmysqlclient-dev'], + Package['libmysqlclient-dev'], Package['librdkafka-dev'] ], } diff --git a/puppet/modules/role/manifests/striker.pp b/puppet/modules/role/manifests/striker.pp index bc1965c..8fe839a 100644 --- a/puppet/modules/role/manifests/striker.pp +++ b/puppet/modules/role/manifests/striker.pp @@ -126,7 +126,7 @@ require_package( 'libffi-dev', 'libldap2-dev', - 'default-libmysqlclient-dev', + 'libmysqlclient-dev', 'libsasl2-dev', 'libssl-dev', $python, diff --git a/puppet/modules/sentry/manifests/init.pp b/puppet/modules/sentry/manifests/init.pp index 882ce9a..fd85a72 100644 --- a/puppet/modules/sentry/manifests/init.pp +++ b/puppet/modules/sentry/manifests/init.pp @@ -69,7 +69,7 @@ require ::virtualenv # http://stackoverflow.com/questions/5178292/pip-install-mysql-python-fails-with-environmenterror-mysql-config-not-found - require_package('default-libmysqlclient-dev') + require_package('libmysqlclient-dev') # needed for building the python package lxml require_package('libxml2-dev', 'libxslt1-dev') # needed for building the python package cffi (?) @@ -87,7 +87,7 @@ 'sentry[mysql]==7.7.0', 'raven', ], - require => Package['default-libmysqlclient-dev'], + require => Package['libmysqlclient-dev'], timeout => 600, # This can take a while } -- To view, visit https://gerrit.wikimedia.org/r/394828 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30207cd19b4a242dc409c7de6eb4c6254ec9509b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits