Update the mediawiki cookbook and upstream cookbooks
Compatibility with Chef 14
This commit is contained in:
@@ -3,10 +3,10 @@
|
||||
# Author:: Seth Chisamore (<schisamo@chef.io>)
|
||||
# Author:: Paul Morton (<pmorton@biaprotect.com>)
|
||||
# Cookbook:: windows
|
||||
# Provider:: registry
|
||||
# Library:: registry_helper
|
||||
#
|
||||
# Copyright:: 2010-2017, VMware, Inc.
|
||||
# Copyright:: 2011-2017, Chef Software, Inc.
|
||||
# Copyright:: 2011-2018, Chef Software, Inc.
|
||||
# Copyright:: 2011-2017, Business Intelligence Associates, Inc
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@@ -45,7 +45,7 @@ module Windows
|
||||
hkey = {
|
||||
'HKLM' => 'HKEY_LOCAL_MACHINE',
|
||||
'HKCU' => 'HKEY_CURRENT_USER',
|
||||
'HKU' => 'HKEY_USERS',
|
||||
'HKU' => 'HKEY_USERS',
|
||||
}[hive_name] || hive_name
|
||||
|
||||
Chef::Log.debug("Hive resolved to #{hkey}")
|
||||
@@ -257,9 +257,9 @@ module Windows
|
||||
end
|
||||
|
||||
Chef::Log.debug("Resolved user SID to #{sid}")
|
||||
return sid
|
||||
sid
|
||||
rescue
|
||||
return nil
|
||||
nil
|
||||
end
|
||||
|
||||
def hive_loaded?(path)
|
||||
@@ -350,7 +350,7 @@ module Windows
|
||||
end
|
||||
|
||||
module Registry
|
||||
module_function
|
||||
module_function # rubocop: disable Lint/UselessAccessModifier
|
||||
|
||||
extend Windows::RegistryHelper
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user