[packages/vagrant] use chef-client as test, not knife

glen glen at pld-linux.org
Wed Aug 19 16:25:55 CEST 2015


commit 3353e2a3bdd04afe0bde2a80870d466a3044391b
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Aug 19 17:09:46 2015 +0300

    use chef-client as test, not knife

 pld-chef-installed.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/pld-chef-installed.patch b/pld-chef-installed.patch
index 5a9635e..96f1667 100644
--- a/pld-chef-installed.patch
+++ b/pld-chef-installed.patch
@@ -19,18 +19,18 @@
 +  module Chef
 +    module Cap
 +      module PLD
-+        module ChefInstalled 
++        module ChefInstalled
 +          # Check if Chef is installed at the given version.
 +          # @return [true, false]
 +          def self.chef_installed(machine, version)
-+            knife = "/usr/bin/knife"
++            knife = "/usr/bin/chef-client"
 +            command = "test -x #{knife}"
-+            
++
 +            if version != :latest
 +              command << "&& #{knife} --version | grep 'Chef: #{version}'"
 +            end
 +
-+            machine.communicate.test(command, sudo: true)         
++            machine.communicate.test(command, sudo: true)
 +          end
 +        end
 +      end
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/3353e2a3bdd04afe0bde2a80870d466a3044391b



More information about the pld-cvs-commit mailing list