Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/278019

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, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/19/278019/1

diff --git a/puppet/modules/eventlogging/manifests/init.pp 
b/puppet/modules/eventlogging/manifests/init.pp
index e3ac901..22a07ec 100644
--- a/puppet/modules/eventlogging/manifests/init.pp
+++ b/puppet/modules/eventlogging/manifests/init.pp
@@ -15,8 +15,8 @@
         require => Git::Clone['eventlogging'],
     }
 
-    package { 'libmysqlclient-dev':
-        ensure => present,
+    if !defined(Package['libmysqlclient-dev']) {
+        package { 'libmysqlclient-dev': ensure => 'installed' }
     }
 
     # These packages aren't currently satisfied by eventlogging's

-- 
To view, visit https://gerrit.wikimedia.org/r/278019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I481683a1be3e487c23aa970437a2eaa35efc98e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to