diff options
Diffstat (limited to 'lib/puppet/util')
28 files changed, 8 insertions, 54 deletions
diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 280961837..a52575522 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -107,16 +107,11 @@ class Puppet::Util::Autoload # Load every instance of everything we can find. eachdir do |dir| Dir.glob("#{dir}/*.rb").each do |file| - # Load here, rather than require, so that facts - # can be reloaded. This has some short-comings, I - # believe, but it works as long as real classes - # aren't used. name = File.basename(file).sub(".rb", '').intern next if loaded?(name) - next if $".include?(File.join(@path, name.to_s + ".rb")) - filepath = File.join(@path, name.to_s + ".rb") + rubypath = File.join(@path, name.to_s) begin - Kernel.require file + Kernel.require rubypath loaded(name, file) rescue => detail if Puppet[:trace] diff --git a/lib/puppet/util/classgen.rb b/lib/puppet/util/classgen.rb index 0c774eecd..4e1e57c85 100644 --- a/lib/puppet/util/classgen.rb +++ b/lib/puppet/util/classgen.rb @@ -205,4 +205,3 @@ module Puppet::Util::ClassGen end end -# $Id$ diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb index 38a6eeb26..aabf58d89 100644 --- a/lib/puppet/util/docs.rb +++ b/lib/puppet/util/docs.rb @@ -101,4 +101,3 @@ module Puppet::Util::Docs module_function :scrub end -# $Id$ diff --git a/lib/puppet/util/errors.rb b/lib/puppet/util/errors.rb index d077abdee..badba595c 100644 --- a/lib/puppet/util/errors.rb +++ b/lib/puppet/util/errors.rb @@ -52,4 +52,3 @@ module Puppet::Util::Errors end end -# $Id$ diff --git a/lib/puppet/util/execution.rb b/lib/puppet/util/execution.rb index 467cd3f52..b8dcde58d 100644 --- a/lib/puppet/util/execution.rb +++ b/lib/puppet/util/execution.rb @@ -19,4 +19,3 @@ module Puppet::Util::Execution end end -# $Id$ diff --git a/lib/puppet/util/fact_store.rb b/lib/puppet/util/fact_store.rb index f872ebb01..a93aa4265 100644 --- a/lib/puppet/util/fact_store.rb +++ b/lib/puppet/util/fact_store.rb @@ -57,4 +57,3 @@ module Puppet::Util end end -# $Id$ diff --git a/lib/puppet/util/fileparsing.rb b/lib/puppet/util/fileparsing.rb index 6a04dee5a..7552e8141 100644 --- a/lib/puppet/util/fileparsing.rb +++ b/lib/puppet/util/fileparsing.rb @@ -394,4 +394,3 @@ module Puppet::Util::FileParsing end end -# $Id$ diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb index 4fd646331..2f1dabe62 100755 --- a/lib/puppet/util/filetype.rb +++ b/lib/puppet/util/filetype.rb @@ -309,4 +309,3 @@ class Puppet::Util::FileType end end -# $Id$ diff --git a/lib/puppet/util/graph.rb b/lib/puppet/util/graph.rb index e51b8e25a..028df5539 100644 --- a/lib/puppet/util/graph.rb +++ b/lib/puppet/util/graph.rb @@ -36,4 +36,3 @@ module Puppet::Util::Graph end end -# $Id$ diff --git a/lib/puppet/util/inifile.rb b/lib/puppet/util/inifile.rb index bd01759ba..9f5582e95 100644 --- a/lib/puppet/util/inifile.rb +++ b/lib/puppet/util/inifile.rb @@ -206,4 +206,3 @@ module Puppet::Util::IniConfig end end -# $Id$ diff --git a/lib/puppet/util/loadedfile.rb b/lib/puppet/util/loadedfile.rb index 32a832d0f..c91fb847f 100755 --- a/lib/puppet/util/loadedfile.rb +++ b/lib/puppet/util/loadedfile.rb @@ -65,4 +65,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb index e7e000e30..22f4f3233 100644 --- a/lib/puppet/util/log.rb +++ b/lib/puppet/util/log.rb @@ -546,4 +546,3 @@ class Puppet::Util::Log end Puppet::Log = Puppet::Util::Log -# $Id$ diff --git a/lib/puppet/util/log_paths.rb b/lib/puppet/util/log_paths.rb index 5cfec34cb..1a6bafc45 100644 --- a/lib/puppet/util/log_paths.rb +++ b/lib/puppet/util/log_paths.rb @@ -13,4 +13,3 @@ module Puppet::Util::LogPaths end end -# $Id$ diff --git a/lib/puppet/util/logging.rb b/lib/puppet/util/logging.rb index 298df93ba..13480743c 100644 --- a/lib/puppet/util/logging.rb +++ b/lib/puppet/util/logging.rb @@ -17,4 +17,3 @@ module Puppet::Util::Logging end end -# $Id$ diff --git a/lib/puppet/util/metaid.rb b/lib/puppet/util/metaid.rb index 0978e7b32..0c38a5b1b 100644 --- a/lib/puppet/util/metaid.rb +++ b/lib/puppet/util/metaid.rb @@ -19,4 +19,3 @@ class Object end end -# $Id$ diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb index 133aa9c2a..d0719ff3b 100644 --- a/lib/puppet/util/metric.rb +++ b/lib/puppet/util/metric.rb @@ -149,4 +149,3 @@ end Puppet::Metric = Puppet::Util::Metric -# $Id$ diff --git a/lib/puppet/util/plist.rb b/lib/puppet/util/plist.rb index d7b07a0ec..d7a95da23 100644 --- a/lib/puppet/util/plist.rb +++ b/lib/puppet/util/plist.rb @@ -21,4 +21,3 @@ module Plist VERSION = '3.0.0' end -# $Id$ diff --git a/lib/puppet/util/plist/generator.rb b/lib/puppet/util/plist/generator.rb index b61c7694c..c615ac43b 100644 --- a/lib/puppet/util/plist/generator.rb +++ b/lib/puppet/util/plist/generator.rb @@ -223,4 +223,3 @@ class Hash #:nodoc: include Plist::Emit end -# $Id$ diff --git a/lib/puppet/util/plist/parser.rb b/lib/puppet/util/plist/parser.rb index 0d14533ae..7308bfb9b 100644 --- a/lib/puppet/util/plist/parser.rb +++ b/lib/puppet/util/plist/parser.rb @@ -224,4 +224,3 @@ module Plist end end -# $Id$ diff --git a/lib/puppet/util/posix.rb b/lib/puppet/util/posix.rb index d7e3bb8b2..84fb744a9 100755 --- a/lib/puppet/util/posix.rb +++ b/lib/puppet/util/posix.rb @@ -116,4 +116,3 @@ module Puppet::Util::POSIX end end -# $Id$ diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb index 4cc74f449..d5f272420 100644 --- a/lib/puppet/util/provider_features.rb +++ b/lib/puppet/util/provider_features.rb @@ -175,4 +175,3 @@ module Puppet::Util::ProviderFeatures end end -# $Id$ diff --git a/lib/puppet/util/rails/collection_merger.rb b/lib/puppet/util/rails/collection_merger.rb index 27e3fad40..4a941b881 100644 --- a/lib/puppet/util/rails/collection_merger.rb +++ b/lib/puppet/util/rails/collection_merger.rb @@ -54,4 +54,3 @@ module Puppet::Util::CollectionMerger end end -# $Id$ diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb index 3446aeb06..b2186ab64 100644 --- a/lib/puppet/util/reference.rb +++ b/lib/puppet/util/reference.rb @@ -186,4 +186,3 @@ class Puppet::Util::Reference end end -# $Id$ diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 1478cd8a5..0bd288ec2 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -562,7 +562,7 @@ class Puppet::Util::Settings return transport.to_configuration end - # Convert our list of objects into a configuration file. + # Convert our list of config elements into a configuration file. def to_config str = %{The configuration file for #{Puppet[:name]}. Note that this file is likely to have unused configuration parameters in it; any parameter that's @@ -654,28 +654,13 @@ Generated on #{Time.now}. config = bucket.to_configuration config.host_config = false - config.apply + config.apply do |transaction| + if failures = transaction.any_failed? + raise "Could not configure for running; got %s failure(s)" % failures + end + end config.clear -# tags = nil -# if Puppet[:tags] -# tags = Puppet[:tags] -# Puppet[:tags] = "" -# end -# trans = objects.evaluate -# trans.ignoretags = true -# trans.configurator = true -# trans.evaluate -# if tags -# Puppet[:tags] = tags -# end -# -# # Remove is a recursive process, so it's sufficient to just call -# # it on the component. -# objects.remove(true) -# -# objects = nil - runners.each { |s| @used << s } end end diff --git a/lib/puppet/util/subclass_loader.rb b/lib/puppet/util/subclass_loader.rb index 00f011d03..dd0d6dd03 100644 --- a/lib/puppet/util/subclass_loader.rb +++ b/lib/puppet/util/subclass_loader.rb @@ -87,4 +87,3 @@ module Puppet::Util::SubclassLoader end end -# $Id$ diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb index c1ff66248..3108fdf5f 100644 --- a/lib/puppet/util/suidmanager.rb +++ b/lib/puppet/util/suidmanager.rb @@ -69,4 +69,3 @@ module Puppet::Util::SUIDManager module_function :system end -# $Id$ diff --git a/lib/puppet/util/variables.rb b/lib/puppet/util/variables.rb index 7e04cf1c0..1a78ef5c1 100644 --- a/lib/puppet/util/variables.rb +++ b/lib/puppet/util/variables.rb @@ -36,4 +36,3 @@ module Puppet::Util::Variables end end -# $Id$ diff --git a/lib/puppet/util/warnings.rb b/lib/puppet/util/warnings.rb index 8e4591474..d009c3967 100644 --- a/lib/puppet/util/warnings.rb +++ b/lib/puppet/util/warnings.rb @@ -12,4 +12,3 @@ module Puppet::Util::Warnings end end -# $Id$ |