diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-13 00:17:57 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-13 00:17:57 -0700 |
| commit | 4dd6a77481400b7eeac3377267d092d4c6d22da3 (patch) | |
| tree | f95d292596144832805a9b57a55bc440f7cfaa43 /lib/puppet/util | |
| parent | 941c56a283265cdf5a951ecaae63580b60486c52 (diff) | |
(#7056) Use 'face' rather than 'faces' in the production code.
After some discussion we decided that most uses of the Puppet Face
infrastructure were about single faces on their own, not about the collection,
and so we were better referring to Puppet::Face[...] in code.
This implements that by translating names and references in the Ruby code to
the new, s-less, name.
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/command_line.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/util/selinux.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/util/command_line.rb b/lib/puppet/util/command_line.rb index fa462ee2d..a884b8658 100644 --- a/lib/puppet/util/command_line.rb +++ b/lib/puppet/util/command_line.rb @@ -70,8 +70,8 @@ module Puppet # Doing this at the top of the file is natural, but causes puppet.rb # to load too early, which causes things to break. This is a nasty # thing, found in #7065. --daniel 2011-04-11 - require 'puppet/faces/help' - puts Puppet::Faces[:help, :current].help + require 'puppet/face' + puts Puppet::Face[:help, :current].help end end diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index 9d0e0a715..cec8a57d9 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -1,4 +1,4 @@ -# Provides utility functions to help interfaces Puppet to SELinux. +# Provides utility functions to help interface Puppet to SELinux. # # This requires the very new SELinux Ruby bindings. These bindings closely # mirror the SELinux C library interface. |