[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Daniel Pittman]

The following commit has been merged in the experimental branch:
commit 7228f580a22cc13dc66a93d81bf57a5bad80a73f
Author: Daniel Pittman <daniel at puppetlabs.com>
Date:   Mon Apr 11 11:42:25 2011 -0700

    maint: finish transition of application help to return strings.
    
    Jesse made a change, in e1191f33defcaffec5900c7122a89ca75d3a9673, to
    transition from printing and exiting in the help method up to returning the
    help data to the caller.  This was part of eliminating rdoc usage from the
    display of help to the user.
    
    The cert application was missed, and still used the legacy "print and exit"
    model; this cleans that up so it matches the rest of the code.
    
    Paired-With: Matt Robinson <matt at puppetlabs.com>

diff --git a/lib/puppet/application/cert.rb b/lib/puppet/application/cert.rb
index cbd6fd6..c087753 100644
--- a/lib/puppet/application/cert.rb
+++ b/lib/puppet/application/cert.rb
@@ -48,7 +48,7 @@ class Puppet::Application::Cert < Puppet::Application
   end
 
   def help
-    puts <<-HELP
+    <<-HELP
 
 puppet-cert(8) -- Manage certificates and requests
 ========
@@ -166,7 +166,6 @@ COPYRIGHT
 Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     HELP
-    exit
   end
 
   def main

-- 
Puppet packaging for Debian