Signed-off-by: James Turnbull <[email protected]>
---
Local-branch: tickets/master/6693
lib/puppet/feature/base.rb | 2 +-
lib/puppet/feature/windows.rb | 16 ----------------
lib/puppet/provider/group/groupadd_win.rb | 2 +-
lib/puppet/provider/user/useradd_win.rb | 2 +-
lib/puppet/util/windows_system.rb | 5 -----
5 files changed, 3 insertions(+), 24 deletions(-)
delete mode 100644 lib/puppet/feature/windows.rb
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb
index c983f5c..686dbc8 100644
--- a/lib/puppet/feature/base.rb
+++ b/lib/puppet/feature/base.rb
@@ -43,7 +43,7 @@ Puppet.features.add(:posix) do
end
# We can use Microsoft Windows functions
-Puppet.features.add(:microsoft_windows, :libs => ["sys/admin",
"win32/process", "win32/dir"])
+Puppet.features.add(:microsoft_windows, :libs => ["sys/admin",
"win32/process", "win32/dir", "win32ole", "win32/api"])
raise Puppet::Error,"Cannot determine basic system flavour" unless
Puppet.features.posix? or Puppet.features.microsoft_windows?
diff --git a/lib/puppet/feature/windows.rb b/lib/puppet/feature/windows.rb
deleted file mode 100644
index d5e4f38..0000000
--- a/lib/puppet/feature/windows.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'puppet/util/feature'
-
-Puppet.features.add(:windows) do
- result = false
-
- if Facter.operatingsystem == 'windows'
- begin
- require 'win32ole'
- require 'Win32API'
- result = true
- rescue
- end
- end
-
- result
-end
diff --git a/lib/puppet/provider/group/groupadd_win.rb
b/lib/puppet/provider/group/groupadd_win.rb
index 6d15d9d..ffc4791 100644
--- a/lib/puppet/provider/group/groupadd_win.rb
+++ b/lib/puppet/provider/group/groupadd_win.rb
@@ -1,7 +1,7 @@
Puppet::Type.type(:group).provide :groupadd_win do
desc "Group management for windows"
- confine :true => Puppet.features.windows?
+ confine :true => Puppet.features.microsoft_windows?
require 'puppet/util/windows_system'
has_features :manages_members
diff --git a/lib/puppet/provider/user/useradd_win.rb
b/lib/puppet/provider/user/useradd_win.rb
index cf9cae4..599840c 100644
--- a/lib/puppet/provider/user/useradd_win.rb
+++ b/lib/puppet/provider/user/useradd_win.rb
@@ -3,7 +3,7 @@ require 'puppet/provider'
Puppet::Type.type(:user).provide :useradd_win do
desc "User management for windows"
- confine :true => Puppet.features.windows?
+ confine :true => Puppet.features.microsoft_windows?
require 'puppet/util/windows_system'
has_features :manages_passwords
diff --git a/lib/puppet/util/windows_system.rb
b/lib/puppet/util/windows_system.rb
index 737a218..83af64d 100644
--- a/lib/puppet/util/windows_system.rb
+++ b/lib/puppet/util/windows_system.rb
@@ -1,8 +1,3 @@
-if Puppet.features.windows?
- require 'win32ole'
- require 'Win32API'
-end
-
module Puppet::Util::ADSI
def self.connectable?(uri)
begin
--
1.7.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
