Fix issues with pear info and encodings

lermit · Jan 9, 2015 · ee5a916 · ee5a916
1 parent 02d9e98
commit ee5a916
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/pear/module.pp b/manifests/pear/module.pp
@@ -59,13 +59,13 @@
   }
 
   $pear_exec_unless = $ensure ? {
-    present => "pear info ${pear_source}",
+    present => "pear shell-test ${pear_source} > 0",
     absent  => undef
   }
 
   $pear_exec_onlyif = $ensure ? {
     present => undef,
-    absent  => "pear info ${pear_source}",
+    absent  => "pear shell-test ${pear_source} > 0",
   }
 
   $real_service = $service ? {

diff --git a/spec/defines/php_pear_module_spec.rb b/spec/defines/php_pear_module_spec.rb
@@ -39,7 +39,7 @@
     it 'should install pear module with exec commands' do
       should contain_exec('pear-Crypt-CHAP').with(
         'command' => 'pear -d preferred_state=stable install  pear.php.net/Crypt-CHAP',
-        'unless'  => 'pear info pear.php.net/Crypt-CHAP | iconv -c'
+        'unless'  => 'pear shell-test pear.php.net/Crypt-CHAP > 0'
       )
     end
   end