summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/provider/mount/solaris.rb1
-rw-r--r--lib/chef/provider/package/zypper.rb1
-rw-r--r--lib/chef/resource/execute.rb4
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/chef/provider/mount/solaris.rb b/lib/chef/provider/mount/solaris.rb
index 203efa2cd4..245e04f40e 100644
--- a/lib/chef/provider/mount/solaris.rb
+++ b/lib/chef/provider/mount/solaris.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
# Author:: Hugo Fichter
# Author:: Lamont Granquist (<lamont@chef.io>)
# Author:: Joshua Timberman (<joshua@chef.io>)
diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index 5532f89d1f..1096dcd044 100644
--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#
# Authors:: Adam Jacob (<adam@chef.io>)
# Ionuț Arțăriși (<iartarisi@suse.cz>)
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index ff2043596b..cc4837c901 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -630,11 +630,11 @@ class Chef
end
# if domain is provided in both username and domain
- if specified_user.kind_of?(String) && ((specified_user.include? '\\') || (specified_user.include? "@")) && specified_domain
+ if specified_user.is_a?(String) && ((specified_user.include? '\\') || (specified_user.include? "@")) && specified_domain
raise ArgumentError, "The domain is provided twice. Username: `#{specified_user}`, Domain: `#{specified_domain}`. Please specify domain only once."
end
- if specified_user.kind_of?(String) && specified_domain.nil?
+ if specified_user.is_a?(String) && specified_domain.nil?
# Splitting username of format: Domain\Username
domain_and_user = user.split('\\')