Update upstream cookbooks
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
#
|
||||
# Cookbook Name:: iis
|
||||
# Cookbook:: iis
|
||||
# Library:: helper
|
||||
#
|
||||
# Author:: Julian C. Dunn <jdunn@chef.io>
|
||||
# Author:: Justin Schuhmann <jmschu02@gmail.com>
|
||||
#
|
||||
# Copyright 2013, Chef Software, Inc.
|
||||
# Copyright:: 2013-2016, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -67,11 +67,11 @@ module Opscode
|
||||
end
|
||||
|
||||
def windows_cleanpath(path)
|
||||
if !defined?(Chef::Util::PathHelper.cleanpath).nil?
|
||||
path = Chef::Util::PathHelper.cleanpath(path)
|
||||
else
|
||||
path = win_friendly_path(path)
|
||||
end
|
||||
path = if defined?(Chef::Util::PathHelper.cleanpath).nil?
|
||||
win_friendly_path(path)
|
||||
else
|
||||
Chef::Util::PathHelper.cleanpath(path)
|
||||
end
|
||||
# Remove any trailing slashes to prevent them from accidentally escaping any quotes.
|
||||
path.chomp('/').chomp('\\')
|
||||
end
|
||||
@@ -96,7 +96,7 @@ module Opscode
|
||||
version_string.slice! 'Version '
|
||||
@iis_version = version_string
|
||||
end
|
||||
@iis_version
|
||||
@iis_version.to_f
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user