Faidon Liambotis has submitted this change and it was merged.
Change subject: toollabs: DTRT with both trusty and >= trusty
......................................................................
toollabs: DTRT with both trusty and >= trusty
Change-Id: Ie8c6050177f7414ac4b882c8cdd2945a9d130fb7
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 6 insertions(+), 13 deletions(-)
Approvals:
coren: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index 61a8197..d2055ea 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -18,22 +18,14 @@
#
class toollabs::dev_environ {
- if os_version('ubuntu >= trusty') {
- package { [
- # 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
- 'libmysqlclient-dev',
- 'libboost-python1.54-dev',
- ]:
+ if os_version('ubuntu trusty') {
+ # libmariadbclient-dev is buggy on trusty
+ # https://bugs.debian.org/759309
+ package { 'libmysqlclient-dev':
ensure => latest,
}
} else {
- package { [
- 'libmariadbclient-dev',
- 'libboost-python1.48-dev',
- ]:
+ package { 'libmariadbclient-dev':
ensure => latest,
}
}
@@ -82,6 +74,7 @@
'python-coverage', # Bug 57002
'python-dev',
'python3-dev',
+ 'libboost-python-dev',
'qt4-qmake',
'sbt',
'sqlite3',
--
To view, visit https://gerrit.wikimedia.org/r/179083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8c6050177f7414ac4b882c8cdd2945a9d130fb7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
