summaryrefslogtreecommitdiff
path: root/lib/facter
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-02-28 11:01:15 -0800
committerJeff McCune <jeff@puppetlabs.com>2012-03-05 15:22:06 -0800
commitafd22ddc99af306aa476be7eaf9f02ada941c97b (patch)
treedc951630d4c7c4b9f0b49793ebed3b782c903b0c /lib/facter
parentc0ac470e764841b0de88dbabade342dc2c1b193e (diff)
(#12357) Fix root_home fact on Windows
Without this patch the root_home fact fails on windows. This patch fixes the problem by only calling methods on the object returned by the `getent passwd root` command if the object evaluates to true. Because there is no root account on Windows the code block simply returns `nil` which makes the Facter fact undefined on Windows platforms. The root cause of the failure is that we always expected the command to succeed and return something useful, and it may not on all supported platforms.
Diffstat (limited to 'lib/facter')
-rw-r--r--lib/facter/root_home.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/facter/root_home.rb b/lib/facter/root_home.rb
index 61fcf39..8249f7d 100644
--- a/lib/facter/root_home.rb
+++ b/lib/facter/root_home.rb
@@ -7,7 +7,9 @@ module Facter::Util::RootHome
def get_root_home
root_ent = Facter::Util::Resolution.exec("getent passwd root")
# The home directory is the sixth element in the passwd entry
- root_ent.split(":")[5]
+ # If the platform doesn't have getent, root_ent will be nil and we should
+ # return it straight away.
+ root_ent && root_ent.split(":")[5]
end
end
end