jenkins-bot has submitted this change and it was merged.
Change subject: Fix race condition with wikimetrics
......................................................................
Fix race condition with wikimetrics
Depending on which module is processed first, the package
might still be defined twice.
Change-Id: I481683a1be3e487c23aa970437a2eaa35efc98e2
---
M puppet/modules/eventlogging/manifests/init.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/eventlogging/manifests/init.pp
b/puppet/modules/eventlogging/manifests/init.pp
index e3ac901..04e44b4 100644
--- a/puppet/modules/eventlogging/manifests/init.pp
+++ b/puppet/modules/eventlogging/manifests/init.pp
@@ -15,9 +15,7 @@
require => Git::Clone['eventlogging'],
}
- package { 'libmysqlclient-dev':
- ensure => present,
- }
+ require_package('libmysqlclient-dev')
# These packages aren't currently satisfied by eventlogging's
# setup.py due to Trusty vs. Jessie issues. This will
--
To view, visit https://gerrit.wikimedia.org/r/278019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I481683a1be3e487c23aa970437a2eaa35efc98e2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
