Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/170089
Change subject: Install libmysqlclient-dev on Trusty but not on Precise.
......................................................................
Install libmysqlclient-dev on Trusty but not on Precise.
This is terrible.
Change-Id: Ifd7d16f7b5459b1e7e163a27ce742966a0856800
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/170089/1
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index f98c5d0..60e4fa1 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -18,9 +18,16 @@
#
class toollabs::dev_environ {
- package { 'libmariadbclient-dev':
- ensure => absent,
- before => Package['libmysqlclient-dev'],
+ # Previously we installed libmariadbclient-dev, but that causes
+ # dependency issues on Trusty. libmariadbclient-dev formerly
+ # provided libmysqlclient-dev, but not in trusty.
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759309
+ if ubuntu_version('>= trusty') {
+ package { 'libmysqlclient-dev':
+ ensure => present,
+ } else {
+ package { 'libmariadbclient-dev':
+ ensure => present,
}
package { [
@@ -44,11 +51,6 @@
'libfreetype6-dev',
'libgdal1-dev', # Bug 56995
'libgeoip-dev', # Bug 62649
- # Previously we installed libmariadbclient-dev, but that causes
- # dependency issues on Trusty. libmariadbclient-dev formerly
- # provided libmysqlclient-dev, but no longer.
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759309
- 'libmysqlclient-dev',
'libpng12-dev',
'libproj-dev', # Bug 56995
'libprotobuf-dev', # Bug 56995
--
To view, visit https://gerrit.wikimedia.org/r/170089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7d16f7b5459b1e7e163a27ce742966a0856800
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
