Skip to content
This repository was archived by the owner on Jun 11, 2019. It is now read-only.

Commit 2d794f1

Browse files
committed
Merge pull request #79 from mscharley/master
Fix issues with `pear info` and encodings
2 parents 02d9e98 + ee5a916 commit 2d794f1

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

manifests/pear/module.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
}
6060

6161
$pear_exec_unless = $ensure ? {
62-
present => "pear info ${pear_source}",
62+
present => "pear shell-test ${pear_source} > 0",
6363
absent => undef
6464
}
6565

6666
$pear_exec_onlyif = $ensure ? {
6767
present => undef,
68-
absent => "pear info ${pear_source}",
68+
absent => "pear shell-test ${pear_source} > 0",
6969
}
7070

7171
$real_service = $service ? {

spec/defines/php_pear_module_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
it 'should install pear module with exec commands' do
4040
should contain_exec('pear-Crypt-CHAP').with(
4141
'command' => 'pear -d preferred_state=stable install pear.php.net/Crypt-CHAP',
42-
'unless' => 'pear info pear.php.net/Crypt-CHAP | iconv -c'
42+
'unless' => 'pear shell-test pear.php.net/Crypt-CHAP > 0'
4343
)
4444
end
4545
end

0 commit comments

Comments
 (0)