Showing with 8 additions and 8 deletions.

+3 −0 CHANGELOG.md

+0 −5 lib/puppet/feature/windows_env.rb

+4 −2 lib/puppet/provider/windows_env/windows_env.rb

+1 −1 metadata.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v2.2.1
+- Fixes to prevent autoloading on master from failing
+
 v2.2.0
 ------
 - Puppet 3.7 / Ruby 64 bit compatibility changes.

diff --git a/lib/puppet/feature/windows_env.rb b/lib/puppet/feature/windows_env.rb
diff --git a/lib/puppet/provider/windows_env/windows_env.rb b/lib/puppet/provider/windows_env/windows_env.rb
@@ -12,7 +12,9 @@ class Registry
   end
 end
 
-require 'puppet/feature/windows_env'
+require 'puppet/util/feature'
+
+Puppet.features.add(:windows_env, :libs => ['ffi'])
 
 if Puppet.version < '3.4.0'
   # This is the best pre-3.4.0 way to do unconditional cleanup for a provider.
@@ -45,7 +47,7 @@ def evaluate
   # The 'windows_env' feature includes FFI.  Here we need to be able to fully
   # load the provider even if FFI is absent so that the catalog can continue
   # (and hopefully install FFI).
-  if Puppet.features.windows_env?
+  if Puppet.features.windows_env? && Puppet.features.microsoft_windows?
     module self::WinAPI
       extend FFI::Library
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "badgerious-windows_env",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "badgerious",
   "summary": "Manages Windows environment variables",
   "license": "Apache License, Version 2.0",