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

[Nick Lewis]

The following commit has been merged in the experimental branch:
commit aa41b27b8687d15c468a343a6e513de8c524139a
Merge: e852580cc09ebead2ef1f8d385338ebea645308a f78ab095a50dc1f0c49cc8a8067b8f43623695b6
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Wed Apr 13 12:34:45 2011 -0700

    Merge branch 'ticket/next/2150' into next

diff --combined lib/puppet/application.rb
index f3a7497,e21fe63..374dc85
--- a/lib/puppet/application.rb
+++ b/lib/puppet/application.rb
@@@ -331,7 -331,7 +331,7 @@@ class Applicatio
  
    def configure_indirector_routes
      route_file = Puppet[:route_file]
-     if File.exists?(route_file)
+     if ::File.exists?(route_file)
        routes = YAML.load_file(route_file)
        application_routes = routes[name.to_s]
        Puppet::Indirector.configure_routes(application_routes) if application_routes
@@@ -359,10 -359,14 +359,10 @@@
        end
      end
  
 -    # scan command line.
 -    begin
 -      option_parser.parse!(self.command_line.args)
 -    rescue OptionParser::ParseError => detail
 -      $stderr.puts detail
 -      $stderr.puts "Try 'puppet #{command_line.subcommand_name} --help'"
 -      exit(1)
 -    end
 +    # Scan command line.  We just hand any exceptions to our upper levels,
 +    # rather than printing help and exiting, so that we can meaningfully
 +    # respond with context-sensitive help if we want to. --daniel 2011-04-12
 +    option_parser.parse!(self.command_line.args)
    end
  
    def handlearg(opt, arg)

-- 
Puppet packaging for Debian