summaryrefslogtreecommitdiff
path: root/lib/chef/mixin
diff options
context:
space:
mode:
authoradamedx <adamedx@gmail.com>2016-04-02 23:23:25 -0700
committerBryan McLellan <btm@loftninjas.org>2017-09-05 20:09:30 -0400
commitde83f5561b98b61081c3ac760354da4df7ed7526 (patch)
treef87fc48f6f67ca91a3d25fbc283dc5cf88033f9e /lib/chef/mixin
parentd8fa21b9851b2a6d3c1ee370c8d0cfee8be278b4 (diff)
downloadchef-de83f5561b98b61081c3ac760354da4df7ed7526.tar.gz
Access remote_file resource source files as alternate user on Windows
Conflicts: spec/support/shared/functional/execute_resource.rb
Diffstat (limited to 'lib/chef/mixin')
-rw-r--r--lib/chef/mixin/user_context.rb2
-rw-r--r--lib/chef/mixin/user_identity.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/mixin/user_context.rb b/lib/chef/mixin/user_context.rb
index 5305678f2b..b29afa5087 100644
--- a/lib/chef/mixin/user_context.rb
+++ b/lib/chef/mixin/user_context.rb
@@ -49,7 +49,7 @@ class Chef
logon_session.open
logon_session.set_user_context
end
- block.call
+ yield
ensure
logon_session.close if logon_session
end
diff --git a/lib/chef/mixin/user_identity.rb b/lib/chef/mixin/user_identity.rb
index 6218b44ac2..c037adb441 100644
--- a/lib/chef/mixin/user_identity.rb
+++ b/lib/chef/mixin/user_identity.rb
@@ -57,7 +57,7 @@ class Chef
domain_and_user = user.split('\\')
if domain_and_user.length == 1
- domain_and_user = user.split('@')
+ domain_and_user = user.split("@")
end
if domain_and_user.length == 2