diff options
| author | Rob Redpath <rob.redpath@wwwh.com> | 2014-11-13 10:07:10 +0000 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-01-25 10:55:54 -0800 |
| commit | 5d3cb5de25e4d2f28c5a6f6bc60c663fb2667ecf (patch) | |
| tree | 564752a2ce787d5555a4dd4aecd49aaede17833b | |
| parent | 9831b13bf39df3eb0503dd0dbae908b97f1fbb4a (diff) | |
| download | chef-5d3cb5de25e4d2f28c5a6f6bc60c663fb2667ecf.tar.gz | |
Use PathHelper to establish path equality
| -rw-r--r-- | lib/chef/application/client.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 5db85ebe9c..be463a7519 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -257,7 +257,7 @@ class Chef::Application::Client < Chef::Application def reconfigure super - Chef::Application.fatal!(pidfile_lockfile_match_error_message) if Chef::Config[:pid_file] == Chef::Config[:lockfile] + Chef::Application.fatal!(pidfile_lockfile_match_error_message) if Chef::Util::PathHelper.paths_eql? Chef::Config[:pid_file], Chef::Config[:lockfile] Chef::Config[:specific_recipes] = cli_arguments.map { |file| File.expand_path(file) } @@ -415,7 +415,8 @@ class Chef::Application::Client < Chef::Application end def pidfile_lockfile_match_error_message - "PID file and lockfile are not permitted to match" + "PID file and lockfile are not permitted to match." + + "\n Specify a different location with --pid or --lockfile" end def unforked_interval_error_message |