jenkins-bot has submitted this change and it was merged.

Change subject: Require php5-cli before using it
......................................................................


Require php5-cli before using it

Bug: T87458
Change-Id: I7d6b49b804d3250023d26dcac771044a1ca94a2c
---
M puppet/modules/php/manifests/composer.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Dan-nl: Looks good to me, but someone else must approve
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/php/manifests/composer.pp 
b/puppet/modules/php/manifests/composer.pp
index 8d29a93..adbf9e8 100644
--- a/puppet/modules/php/manifests/composer.pp
+++ b/puppet/modules/php/manifests/composer.pp
@@ -20,6 +20,7 @@
     exec { 'download_composer':
         command => "curl https://getcomposer.org/composer.phar -o ${bin}",
         unless  => "php5 -r 'try { Phar::loadPhar(\"${bin}\"); exit(0); } 
catch(Exception \$e) { exit(1); }'",
+        require => Package['curl', 'php5-cli'],
     }
 
     file { '/usr/local/bin/composer':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d6b49b804d3250023d26dcac771044a1ca94a2c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dan-nl <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to