diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-14 22:18:36 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-02-14 22:18:36 -0600 |
| commit | 21a714aa75ff896fa67160a5ceaa26b6c0df98f5 (patch) | |
| tree | 5ed2113df29ea1303dfcde3ac09272e45f9ae6b4 /lib/puppet | |
| parent | 327ee17d607937dec007482d1c81bae63c01bf52 (diff) | |
| download | puppet-21a714aa75ff896fa67160a5ceaa26b6c0df98f5.tar.gz puppet-21a714aa75ff896fa67160a5ceaa26b6c0df98f5.tar.xz puppet-21a714aa75ff896fa67160a5ceaa26b6c0df98f5.zip | |
Fixing some tests that somehow broke in the merge to master
I expect these failed in master but not 0.24.x because I'm
better about stubbing calls to Facter in master.
I stubbed these enough that they should continue to
work.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/provider/nameservice/directoryservice.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index 42c52f0a7..71e6ff33e 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -118,7 +118,7 @@ class DirectoryService < Puppet::Provider::NameService begin product_version = Facter.value(:macosx_productversion) if product_version.nil? - raise Puppet::Error, "Could not determine OS X version: %s" % detail + raise Puppet::Error, "Could not determine OS X version from Facter" end product_version_major = product_version.scan(/(\d+)\.(\d+)./).join(".") if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) @@ -533,4 +533,4 @@ class DirectoryService < Puppet::Provider::NameService return @property_value_cache_hash end end -end
\ No newline at end of file +end |