diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-12 17:41:24 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-12 17:41:24 -0700 |
| commit | ced1f7476e562fea8241469471c715778f3b8157 (patch) | |
| tree | 7b1692232877f53b7a18b029b31102c13f405fe8 /lib/facter/root_home.rb | |
| parent | c0ac470e764841b0de88dbabade342dc2c1b193e (diff) | |
| parent | 5d1cec8a66fd67ebf4242c08abdf087783706057 (diff) | |
Merge branch '2.3.x'
* 2.3.x:
(#12357) Fix broken compatibility with Puppet 2.6
(maint) Comment Ken's fix to String#any?
(#13018) Fix missing method any? message for ruby 1.9.x
(#12357) Add ability to display an error message from validate_re
(#12357) Add validate_absolute_path() function
(maint) Stop printing the directory of spec_helper
(#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
(#12357) Add puppet_vardir custom fact
(#12357) Fix root_home fact on Windows
Diffstat (limited to 'lib/facter/root_home.rb')
| -rw-r--r-- | lib/facter/root_home.rb | 4 |
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 |