]> git.pld-linux.org Git - packages/chef.git/blame - optional-plist.patch
- cleaned up deps
[packages/chef.git] / optional-plist.patch
CommitLineData
a8f01bdc
JR
1--- chef-14.1.21/lib/chef/provider/user/dscl.rb~ 2018-05-21 18:22:54.000000000 +0200
2+++ chef-14.1.21/lib/chef/provider/user/dscl.rb 2018-07-14 22:26:52.821861848 +0200
fce4f0b8 3@@ -19,7 +19,6 @@
a8f01bdc
JR
4 require "mixlib/shellout"
5 require "chef/provider/user"
6 require "openssl"
7-require "plist"
8 require "chef/util/path_helper"
fce4f0b8
ER
9
10 class Chef
a8f01bdc 11@@ -136,6 +135,7 @@
fce4f0b8
ER
12
13 # Calling shell_out directly since we want to give an input stream
14 shadow_hash_xml = convert_binary_plist_to_xml(shadow_hash_binary.string)
a8f01bdc
JR
15+ require "plist"
16 shadow_hash = Plist.parse_xml(shadow_hash_xml)
fce4f0b8
ER
17
18 if shadow_hash["SALTED-SHA512"]
a8f01bdc 19@@ -591,6 +591,7 @@
fce4f0b8 20 begin
a8f01bdc
JR
21 user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist"
22 user_plist_info = run_plutil("convert", "xml1", "-o", "-", user_plist_file)
23+ require "plist"
24 user_info = Plist.parse_xml(user_plist_info)
fce4f0b8
ER
25 rescue Chef::Exceptions::PlistUtilCommandFailed
26 end
a8f01bdc 27@@ -604,6 +605,7 @@
fce4f0b8
ER
28 #
29 def save_user_info(user_info)
a8f01bdc
JR
30 user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist"
31+ require "plist"
fce4f0b8 32 Plist::Emit.save_plist(user_info, user_plist_file)
a8f01bdc 33 run_plutil("convert", "binary1", user_plist_file)
fce4f0b8 34 end
This page took 0.026566 seconds and 4 git commands to generate.