summaryrefslogtreecommitdiffstats
path: root/lib/puppet/feature
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-05-12 18:26:43 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit37a55306aa08e2004103e9a4a2a94bba18ffa61d (patch)
tree0e8fd85505a8bfa17b08611ce160211420339cfa /lib/puppet/feature
parentac7efc8f0284d6b35f5428da06ba371cf94998ec (diff)
downloadpuppet-37a55306aa08e2004103e9a4a2a94bba18ffa61d.tar.gz
puppet-37a55306aa08e2004103e9a4a2a94bba18ffa61d.tar.xz
puppet-37a55306aa08e2004103e9a4a2a94bba18ffa61d.zip
Feature #2935 Modes: root? predicate
Use a predicate method to check if we're running as root, rather than comparing the effective user id Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/feature')
-rw-r--r--lib/puppet/feature/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb
index aac04f234..1971f14f2 100644
--- a/lib/puppet/feature/base.rb
+++ b/lib/puppet/feature/base.rb
@@ -15,7 +15,7 @@ Puppet.features.add(:usage, :libs => %w{rdoc/ri/ri_paths rdoc/usage})
Puppet.features.add(:libshadow, :libs => ["shadow"])
# We're running as root.
-Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SUIDManager.uid == 0 }
+Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SUIDManager.root? }
# We've got mongrel available
Puppet.features.add(:mongrel, :libs => %w{rubygems mongrel puppet/network/http_server/mongrel})