As with the previous commit, there was a problem loading a face because
Ruby 1.9.2 doesn't like using non-standard ascii characters without
declaring the encoding at the top of the file.

SyntaxError Exception: 
/Users/matthewrobinson/work/puppet/lib/puppet/face/resource.rb:10:
invalid multibyte char (US-ASCII)

Rather than declare the encoding to allow the French word, I've
translated it (after having to look it up myself).

Reviewed-by: Pieter van de Bruggen <[email protected]>
Signed-off-by: Matt Robinson <[email protected]>
---
Local-branch: ticket/2.7.x/7291-ruby19-fixes
 lib/puppet/face/resource.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/face/resource.rb b/lib/puppet/face/resource.rb
index ed63608..87e5876 100644
--- a/lib/puppet/face/resource.rb
+++ b/lib/puppet/face/resource.rb
@@ -7,7 +7,7 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
   summary "Interact directly with resources via the RAL, like ralsh"
   description <<-EOT
     This face provides a Ruby API with functionality similar to the puppet
-    resource (née ralsh) command line application. It is not intended to be
+    resource (originally ralsh) command line application. It is not intended 
to be
     used from the command line.
   EOT
   notes <<-EOT
-- 
1.7.3.1

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to