diff options
| -rw-r--r-- | lib/chef/provider/launchd.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/osx_profile.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/user/dscl.rb | 6 | ||||
| -rw-r--r-- | lib/chef/provider/user/mac.rb | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb index 3516cadda7..fbb9307712 100644 --- a/lib/chef/provider/launchd.rb +++ b/lib/chef/provider/launchd.rb @@ -161,7 +161,7 @@ class Chef def content plist_hash = new_resource.plist_hash || gen_hash - Plist::Emit.dump(plist_hash) unless plist_hash.nil? + ::Plist::Emit.dump(plist_hash) unless plist_hash.nil? end def gen_hash diff --git a/lib/chef/provider/osx_profile.rb b/lib/chef/provider/osx_profile.rb index 5d76ec067b..07d35e633c 100644 --- a/lib/chef/provider/osx_profile.rb +++ b/lib/chef/provider/osx_profile.rb @@ -233,7 +233,7 @@ class Chef end def read_plist(xml_file) - Plist.parse_xml(xml_file) + ::Plist.parse_xml(xml_file) end def profile_installed? diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb index 687fc021da..a46ecb3a62 100644 --- a/lib/chef/provider/user/dscl.rb +++ b/lib/chef/provider/user/dscl.rb @@ -118,7 +118,7 @@ in 'password', with the associated 'salt' and 'iterations'.") # Calling shell_out directly since we want to give an input stream shadow_hash_xml = convert_binary_plist_to_xml(shadow_hash_binary.string) - shadow_hash = Plist.parse_xml(shadow_hash_xml) + shadow_hash = ::Plist.parse_xml(shadow_hash_xml) if shadow_hash["SALTED-SHA512-PBKDF2"] # 10.7+ contains this, but we retain the check in case it goes away in the future @password_shadow_conversion_algorithm = "SALTED-SHA512-PBKDF2" @@ -541,7 +541,7 @@ in 'password', with the associated 'salt' and 'iterations'.") begin user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist" user_plist_info = run_plutil("convert", "xml1", "-o", "-", user_plist_file) - user_info = Plist.parse_xml(user_plist_info) + user_info = ::Plist.parse_xml(user_plist_info) rescue Chef::Exceptions::PlistUtilCommandFailed end @@ -554,7 +554,7 @@ in 'password', with the associated 'salt' and 'iterations'.") # def save_user_info(user_info) user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist" - Plist::Emit.save_plist(user_info, user_plist_file) + ::Plist::Emit.save_plist(user_info, user_plist_file) run_plutil("convert", "binary1", user_plist_file) end diff --git a/lib/chef/provider/user/mac.rb b/lib/chef/provider/user/mac.rb index 62575851e5..104cf51abe 100644 --- a/lib/chef/provider/user/mac.rb +++ b/lib/chef/provider/user/mac.rb @@ -80,7 +80,7 @@ class Chef admin_group_xml = run_dscl("read", "/Groups/admin") return nil unless admin_group_xml && admin_group_xml != "" - @admin_group_plist = Plist.new(::Plist.parse_xml(admin_group_xml)) + @admin_group_plist = ::Plist.new(::Plist.parse_xml(admin_group_xml)) end def reload_user_plist @@ -95,7 +95,7 @@ class Chef return nil if user_xml.nil? || user_xml == "" - @user_plist = Plist.new(::Plist.parse_xml(user_xml)) + @user_plist = ::Plist.new(::Plist.parse_xml(user_xml)) return unless user_plist[:shadow_hash] |