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

[Matt Robinson]

The following commit has been merged in the experimental branch:
commit 75af5827b68774d0300499fab969239bb8ae6d30
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Mon Mar 7 16:46:24 2011 -0800

    maint: Move puppetdoc settings to defaults so we can use them in tests
    
    Paired-with: Daniel Pittman <daniel at puppetlabs.com>

diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 3bfe416..7481191 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -1,7 +1,6 @@
 require 'puppet/application'
 
 class Puppet::Application::Doc < Puppet::Application
-
   should_not_parse_config
   run_mode :master
 
@@ -140,7 +139,7 @@ COPYRIGHT
 Copyright (c) 2005-2007 Puppet Labs, LLC Licensed under the GNU Public
 License
 
-    HELP
+HELP
   end
 
   def handle_unknown( opt, arg )
@@ -163,11 +162,6 @@ License
     files += command_line.args
     Puppet.info "scanning: #{files.inspect}"
 
-          Puppet.settings.setdefaults(
-        "puppetdoc",
-
-      "document_all" => [false, "Document all resources"]
-    )
     Puppet.settings[:document_all] = options[:all] || false
     begin
       require 'puppet/util/rdoc'
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 576acfe..f308d44 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -822,4 +822,8 @@ module Puppet
       directories."
     ]
   )
+  setdefaults(
+    :puppetdoc,
+    :document_all => [false, "Document all resources"]
+  )
 end

-- 
Puppet packaging for Debian