Permalink
Browse files

Force pear channel discovery to return true

Forcing calls to pear channel-discover to always return true avoids a
failure when the channel has already been discovered. If
channel-discover failed for another reason, it will still be caught when a call to
pear install fails.
  • Loading branch information...
shanethehat committed Mar 21, 2013
1 parent 4403eae commit 5f4fe500c3b797d626ed7faed9be7f6b79734df0
Showing with 8 additions and 8 deletions.
  1. +8 −8 puppet/modules/joindin/manifests/test/test.pp
@@ -13,7 +13,7 @@
# Discover the phpunit pear channel first - must do this separately because
# there is no guarantee of which tool will install first
exec { 'phpunit-channel':
- command => 'pear channel-discover pear.phpunit.de',
+ command => 'pear channel-discover pear.phpunit.de; true',
require => Package['php-pear'],
}
@@ -35,9 +35,9 @@
exec { 'phploc':
creates => '/usr/bin/phploc',
- command => 'pear channel-discover components.ez.no && /
- pear channel-discover pear.netpirates.net && /
- pear channel-discover pear.symfony.com && /
+ command => 'pear channel-discover components.ez.no; true && /
+ pear channel-discover pear.netpirates.net; true && /
+ pear channel-discover pear.symfony.com; true && /
pear install phpunit/phploc',
require => Exec['phpunit-channel'],
before => Notify['test'],
@@ -52,7 +52,7 @@
exec { 'pdepend':
creates => '/usr/bin/pdepend',
- command => 'pear channel-discover pear.pdepend.org && \
+ command => 'pear channel-discover pear.pdepend.org; true && \
pear install pdepend/PHP_Depend-beta',
require => [
Package['php-xml'],
@@ -62,15 +62,15 @@
exec { 'phpmd':
creates => '/usr/bin/phpmd',
- command => 'pear channel-discover pear.phpmd.org && \
+ command => 'pear channel-discover pear.phpmd.org; true && \
pear install phpmd/PHP_PMD',
require => Exec['pdepend'],
before => Notify['test'],
}
exec { 'phing':
creates => '/usr/bin/phing',
- command => 'pear channel-discover pear.phing.info && \
+ command => 'pear channel-discover pear.phing.info; true && \
pear install phing/phing',
require => Package['php-pear'],
before => Notify['test'],
@@ -80,7 +80,7 @@
exec { 'phpdoc':
creates => '/usr/bin/phpdoc',
- command => 'pear channel-discover pear.phpdoc.org && \
+ command => 'pear channel-discover pear.phpdoc.org; true && \
pear install phpdoc/phpDocumentor-alpha',
require => [
Package['php-pear'],

0 comments on commit 5f4fe50

Please sign in to comment.