summaryrefslogtreecommitdiff
path: root/lib/chef/provider/user/mac.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/provider/user/mac.rb')
-rw-r--r--lib/chef/provider/user/mac.rb16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/chef/provider/user/mac.rb b/lib/chef/provider/user/mac.rb
index a3980aa12f..aef831907a 100644
--- a/lib/chef/provider/user/mac.rb
+++ b/lib/chef/provider/user/mac.rb
@@ -221,7 +221,17 @@ class Chef
end
def compare_user
- %i{comment shell uid gid salt password admin secure_token hidden}.any? { |m| diverged?(m) }
+ @change_desc = []
+ %i{comment shell uid gid salt password admin secure_token hidden}.each do |attr|
+ if diverged?(m)
+ desc = "Update #{attr}"
+ unless %i{password gid secure_token hidden}.include?(attr)
+ desc << " from #{current_resource.send(attr)} to #{new_resource.send(attr)}"
+ end
+ @change_desc << desc
+ end
+ end
+ !@change_desc.empty?
end
def manage_user
@@ -290,9 +300,7 @@ class Chef
end
if diverged?(:hidden)
- converge_by("alter hidden") do
- set_hidden
- end
+ converge_by("alter hidden") { set_hidden }
end
reload_user_plist