summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-12-13 08:41:11 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-12-18 14:35:08 +1100
commitf5960ce2bde4af9af1af8bdf106e83d21afacb5c (patch)
tree2c5e92b97e90e8f81f6f8ab7a266c7e09c1351ba /lib/puppet/util
parent2d88926b76e14c8aa105ad7b1480cee9132fc699 (diff)
downloadpuppet-f5960ce2bde4af9af1af8bdf106e83d21afacb5c.tar.gz
puppet-f5960ce2bde4af9af1af8bdf106e83d21afacb5c.tar.xz
puppet-f5960ce2bde4af9af1af8bdf106e83d21afacb5c.zip
Closed #2937 - Migrated a number of requires to features
Diffstat (limited to 'lib/puppet/util')
-rw-r--r--lib/puppet/util/selinux.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index f1336f946..331c8eb82 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -7,11 +7,7 @@
# was abysmal. At this time (2008-11-02) the only distribution providing
# these Ruby SELinux bindings which I am aware of is Fedora (in libselinux-ruby).
-begin
- require 'selinux'
-rescue LoadError
- # Nothing
-end
+Puppet.warning "SELinux not installed" unless Puppet.features.selinux?
require 'pathname'