From 06ad6a375080ccbc38e8adc73b8bd91fa7a819fc Mon Sep 17 00:00:00 2001 From: "Michael V. O'Brien" Date: Tue, 25 Sep 2007 12:34:42 -0500 Subject: Updated the configuration doc to more clearly explain where puppet.conf is expected to be by default. --- lib/puppet/reference/configuration.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index 4b09002b8..c37b2e7dd 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -73,10 +73,14 @@ the client configuration. Configuration Files +++++++++++++++++++ -As mentioned above, the configuration parameters can also be stored in a -configuration file, located in the configuration directory (`/etc/puppet` -by default). As of 0.23.0, all executables look for ``puppet.conf`` in their -configuration directory (although they previously looked for separate files). +As mentioned above, the configuration parameters can also be stored in a +configuration file, located in the configuration directory. As root, the +default configuration directory is ``/etc/puppet``, and as a regular user, the +default configuration directory is ``~user/.puppet``. As of 0.23.0, all +executables look for ``puppet.conf`` in their configuration directory +(although they previously looked for separate files). For example, +``puppet.conf`` is located at ``/etc/puppet/puppet.conf`` as root and +``~user/.puppet/puppet.conf`` as a regular user by default. All executables will set any parameters set within the ``main`` section, while each executable will also look for a section named for the executable -- cgit From 0b8893b3b8ffd391287a590b4f271edca70331da Mon Sep 17 00:00:00 2001 From: "Michael V. O'Brien" Date: Wed, 3 Oct 2007 17:06:06 -0500 Subject: Fixed #832. Added the '--no-daemonize' option to puppetd and puppetmasterd. The default behavior of 'verbose' and 'debug' no longer cause puppetd and puppetmasterd to not daemonize. --- bin/puppetd | 52 ++++++++++++++++++++------------------------- bin/puppetmasterd | 37 ++++++++++++-------------------- lib/puppet.rb | 2 ++ lib/puppet/defaults.rb | 8 +++++-- lib/puppet/util/settings.rb | 2 +- 5 files changed, 46 insertions(+), 55 deletions(-) diff --git a/bin/puppetd b/bin/puppetd index 8d112ca3a..6450d1806 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -8,7 +8,7 @@ # # = Usage # -# puppetd [-D|--daemonize] [-d|--debug] [--disable] [--enable] +# puppetd [-D|--daemonize|--no-daemonize] [-d|--debug] [--disable] [--enable] # [-h|--help] [--fqdn ] [-l|--logdest syslog||console] # [-o|--onetime] [--serve ] [-t|--test] # [-V|--version] [-v|--verbose] [-w|--waitforcert ] @@ -63,8 +63,10 @@ # '--genconfig'. # # daemonize:: -# Send the process into the background. This is the default unless -# +verbose+ or +debug+ is enabled. +# Send the process into the background. This is the default. +# +# no-daemonize:: +# Do not send the process into the background. # # debug:: # Enable full debugging. @@ -161,7 +163,6 @@ require 'getoptlong' options = [ [ "--centrallogging", GetoptLong::NO_ARGUMENT ], - [ "--daemonize", "-D", GetoptLong::NO_ARGUMENT ], [ "--disable", GetoptLong::NO_ARGUMENT ], [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], [ "--enable", GetoptLong::NO_ARGUMENT ], @@ -201,9 +202,7 @@ begin result.each { |opt,arg| case opt # First check to see if the argument is a valid configuration parameter; - # if so, set it. - when "--daemonize" - options[:daemonize] = true + # if so, set it. NOTE: there is a catch-all at the bottom for defaults.rb when "--disable" options[:disable] = true when "--serve" @@ -215,17 +214,7 @@ begin when "--enable" options[:enable] = true when "--test" - # Enable all of the most common test options. - Puppet.settings.handlearg("--ignorecache") - Puppet.settings.handlearg("--no-usecacheonfailure") - Puppet.settings.handlearg("--no-splay") - Puppet.settings.handlearg("--show_diff") - options[:onetime] = true - options[:waitforcert] = 0 - unless Puppet::Util::Log.level == :debug - Puppet::Util::Log.level = :info - end - Puppet::Util::Log.newdestination(:console) + options[:test] = true when "--centrallogging" options[:centrallogs] = true when "--help" @@ -276,6 +265,21 @@ end # Now parse the config Puppet.parse_config +if options[:test] + # Enable all of the most common test options. + Puppet.settings.handlearg("--ignorecache") + Puppet.settings.handlearg("--no-usecacheonfailure") + Puppet.settings.handlearg("--no-splay") + Puppet.settings.handlearg("--show_diff") + Puppet.settings.handlearg("--no-daemonize") + options[:onetime] = true + options[:waitforcert] = 0 + unless Puppet::Util::Log.level == :debug + Puppet::Util::Log.level = :info + end + Puppet::Util::Log.newdestination(:console) +end + Puppet.genconfig Puppet.genmanifest @@ -284,16 +288,6 @@ if Puppet[:noop] Puppet[:show_diff] = true end -# Default to daemonizing, but if verbose or debug is specified, -# default to staying in the foreground. -unless options.include?(:daemonize) - if Puppet::Util::Log.level == :debug or Puppet::Util::Log.level == :info - options[:daemonize] = false - else - options[:daemonize] = true - end -end - unless options[:setdest] Puppet::Util::Log.newdestination(:syslog) end @@ -330,7 +324,7 @@ server = nil # It'd be nice to daemonize later, but we have to daemonize before the # waitforcert happens. -if options[:daemonize] +if Puppet[:daemonize] client.daemonize end diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 51c714b15..acbafa59c 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -7,7 +7,7 @@ # # = Usage # -# puppetmasterd [-D|--daemonize] [-d|--debug] [-h|--help] +# puppetmasterd [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help] # [-l|--logdest |console|syslog] [--nobucket] [--nonodes] # [-v|--verbose] [-V|--version] # @@ -28,11 +28,13 @@ # '--genconfig'. # # daemonize:: -# Send the process into the background. This is the default unless -# +verbose+ or +debug+ is enabled. +# Send the process into the background. This is the default. +# +# no-daemonize:: +# Do not send the process into the background. # # debug:: -# Enable full debugging. Causes the daemon not to go into the background. +# Enable full debugging. # # help:: # Print this help message. @@ -53,7 +55,7 @@ # Do not start the reports server. # # verbose:: -# Enable verbosity. Causes the daemon not to go into the background. +# Enable verbosity. # # version:: # Print the puppet version number and exit. @@ -82,7 +84,6 @@ require 'puppet' require 'puppet/sslcertificates' options = [ - [ "--daemonize", "-D", GetoptLong::NO_ARGUMENT ], [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], [ "--help", "-h", GetoptLong::NO_ARGUMENT ], [ "--logdest", "-l", GetoptLong::REQUIRED_ARGUMENT ], @@ -117,8 +118,8 @@ options = { begin result.each { |opt,arg| case opt - when "--daemonize" - options[:daemonize] = true + # First check to see if the argument is a valid configuration parameter; + # if so, set it. NOTE: there is a catch-all at the bottom for defaults.rb when "--debug" options[:debug] = true when "--help" @@ -161,6 +162,9 @@ rescue GetoptLong::InvalidOption => detail exit(1) end +# Now parse the config +Puppet.parse_config + # Handle the logging settings. if options[:debug] or options[:verbose] if options[:debug] @@ -169,7 +173,7 @@ if options[:debug] or options[:verbose] Puppet::Util::Log.level = :info end - unless options[:daemonize] + unless Puppet[:daemonize] Puppet::Util::Log.newdestination(:console) options[:setdest] = true end @@ -179,24 +183,11 @@ unless options[:setdest] Puppet::Util::Log.newdestination(:syslog) end -# Now parse the config -Puppet.parse_config - Puppet.genconfig Puppet.genmanifest require 'etc' -# Default to daemonizing, but if verbose or debug is specified, -# default to staying in the foreground. -unless options.include?(:daemonize) - if Puppet::Util::Log.level == :debug or Puppet::Util::Log.level == :info - options[:daemonize] = false - else - options[:daemonize] = true - end -end - handlers = { :Status => {}, } @@ -288,7 +279,7 @@ if Puppet[:servertype] == "webrick" end Puppet.settraps -if options[:daemonize] +if Puppet[:daemonize] server.daemonize end diff --git a/lib/puppet.rb b/lib/puppet.rb index c1f31e467..538a3335f 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -117,6 +117,8 @@ module Puppet # Load all of the configuration parameters. require 'puppet/defaults' + # Prints the contents of a config file with the available config elements, or it + # prints a single value of a config element. def self.genconfig if Puppet[:configprint] != "" val = Puppet[:configprint] diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index f76ae9b84..6f44919e2 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -131,7 +131,11 @@ module Puppet :diff => ["diff", "Which diff command to use when printing differences between files."], :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. - This feature currently requires the ``diff/lcs`` Ruby library."] + This feature currently requires the ``diff/lcs`` Ruby library."], + :daemonize => { :default => true, + :desc => "Send the process into the background. This is the default.", + :short => "D" + } ) hostname = Facter["hostname"].value @@ -339,7 +343,7 @@ module Puppet :owner => "root", :mode => 0644, :desc => "The file in which puppetd stores a list of the classes - associated with the retrieved configuratiion. Can be loaded in + associated with the retrieved configuration. Can be loaded in the separate ``puppet`` executable using the ``--loadclasses`` option."}, :puppetdlog => { :default => "$logdir/puppetd.log", diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 1478cd8a5..ab55fbd2b 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 -- cgit From 1be1db91c2ff3103c900da9ba3a3ba533d2587e7 Mon Sep 17 00:00:00 2001 From: "Michael V. O'Brien" Date: Wed, 3 Oct 2007 17:23:59 -0500 Subject: Updated CHANGELOG. --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2e9fd1b34..af206cdef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,11 @@ 0.23.2 (misspiggy) + Fixed #832. Added the '--no-daemonize' option to puppetd and + puppetmasterd. NOTE: The default behavior of 'verbose' and + 'debug' no longer cause puppetd and puppetmasterd to not + daemonize. + + Added k5login type. (#759) + Fixed CA race condition. (#693) Added shortname support to config.rb and refactored addargs -- cgit From 5d50ca790e7f752e07da84197b52ff84d2dcfdb4 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 3 Oct 2007 17:31:57 -0500 Subject: Fixing #814 -- when files are missing, the exceptions should now be more reasonable. --- bin/puppet | 6 ++-- lib/puppet/error.rb | 7 ---- lib/puppet/network/handler/configuration.rb | 17 ++++------ lib/puppet/network/handler/master.rb | 7 +--- lib/puppet/parser/interpreter.rb | 19 ++++++----- spec/unit/parser/interpreter.rb | 51 +++++++++++++++-------------- 6 files changed, 49 insertions(+), 58 deletions(-) diff --git a/bin/puppet b/bin/puppet index deeb65c42..a87a07619 100755 --- a/bin/puppet +++ b/bin/puppet @@ -197,13 +197,13 @@ begin config = client.getconfig config.apply rescue => detail + if Puppet[:trace] + puts detail.backtrace + end if detail.is_a?(XMLRPC::FaultException) $stderr.puts detail.message else $stderr.puts detail end - if Puppet[:trace] - puts detail.backtrace - end exit(1) end diff --git a/lib/puppet/error.rb b/lib/puppet/error.rb index 55fbf2e2f..971b31116 100644 --- a/lib/puppet/error.rb +++ b/lib/puppet/error.rb @@ -41,12 +41,5 @@ module Puppet # :nodoc: # An error class for when I don't know what happened. Automatically # prints a stack trace when in debug mode. class DevError < Puppet::Error - # XXX This is probably the wrong way to do this, but... - def set_backtrace(trace) - if Puppet[:trace] - puts trace - end - super - end end end diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb index 2df1b3ab4..353693bdc 100644 --- a/lib/puppet/network/handler/configuration.rb +++ b/lib/puppet/network/handler/configuration.rb @@ -107,16 +107,13 @@ class Puppet::Network::Handler benchmark(level, "Compiled configuration for %s" % node.name) do begin config = interpreter.compile(node) - rescue Puppet::Error => detail - if Puppet[:trace] - puts detail.backtrace - end - unless local? - Puppet.err detail.to_s - end - raise XMLRPC::FaultException.new( - 1, detail.to_s - ) + rescue => detail + # If we're local, then we leave it to the local system + # to handle error reporting, but otherwise we do it here + # so the interpreter doesn't need to know if the parser + # is local or not. + Puppet.err(detail.to_s) unless local? + raise end end diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 030950c61..25c4318b8 100644 --- a/lib/puppet/network/handler/master.rb +++ b/lib/puppet/network/handler/master.rb @@ -77,12 +77,7 @@ class Puppet::Network::Handler Puppet::Node::Facts.new(client, facts).save # And get the configuration from the config handler - begin - config = config_handler.configuration(client) - rescue => detail - puts detail.backtrace - raise - end + config = config_handler.configuration(client) return translate(config.extract) end diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 81867c84b..0b8c035ba 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -25,7 +25,8 @@ class Puppet::Parser::Interpreter # evaluate our whole tree def compile(node) - return Puppet::Parser::Compile.new(node, parser(node.environment), :ast_nodes => usenodes?).compile + raise Puppet::ParseError, "Could not parse configuration; cannot compile" unless env_parser = parser(node.environment) + return Puppet::Parser::Compile.new(node, env_parser, :ast_nodes => usenodes?).compile end # create our interpreter @@ -74,15 +75,14 @@ class Puppet::Parser::Interpreter parser.parse return parser rescue => detail - if Puppet[:trace] - puts detail.backtrace - end msg = "Could not parse" if environment and environment != "" msg += " for environment %s" % environment end - msg += ": %s" % detail - raise Puppet::Error, detail + msg += ": %s" % detail.to_s + error = Puppet::Error.new(msg) + error.set_backtrace(detail.backtrace) + raise error end end @@ -96,8 +96,11 @@ class Puppet::Parser::Interpreter tmp = create_parser(environment) @parsers[environment].clear if @parsers[environment] @parsers[environment] = tmp - rescue - # Nothing, yo. + rescue => detail + # If a parser already exists, than assume that we logged the + # exception elsewhere and reuse the parser. If one doesn't + # exist, then reraise. + raise detail unless @parsers[environment] end end @parsers[environment] diff --git a/spec/unit/parser/interpreter.rb b/spec/unit/parser/interpreter.rb index a79267b52..b4aa2a2d1 100755 --- a/spec/unit/parser/interpreter.rb +++ b/spec/unit/parser/interpreter.rb @@ -100,12 +100,7 @@ describe Puppet::Parser::Interpreter, " when managing parser instances" do @parser = mock('parser') end - it "it should an exception when nothing is there and nil is returned" do - @interp.expects(:create_parser).with(:myenv).returns(nil) - @interp.send(:parser, :myenv).should be_nil - end - - it "should create and return a new parser and use the same parser when the parser does not need reparsing" do + it "should use the same parser when the parser does not need reparsing" do @interp.expects(:create_parser).with(:myenv).returns(@parser) @interp.send(:parser, :myenv).should equal(@parser) @@ -125,7 +120,12 @@ describe Puppet::Parser::Interpreter, " when managing parser instances" do @interp.send(:parser, :myenv).should equal(newparser) end - it "should keep the old parser if create_parser doesn't return anything." do + it "should fail intelligently if a parser cannot be created and one does not already exist" do + @interp.expects(:create_parser).with(:myenv).raises(ArgumentError) + proc { @interp.send(:parser, :myenv) }.should raise_error(ArgumentError) + end + + it "should keep the old parser if a new parser cannot be created" do # Get the first parser in the hash. @interp.expects(:create_parser).with(:myenv).returns(@parser) @interp.send(:parser, :myenv).should equal(@parser) @@ -134,7 +134,7 @@ describe Puppet::Parser::Interpreter, " when managing parser instances" do @parser.expects(:reparse?).returns(true) # But fail to create a new parser - @interp.expects(:create_parser).with(:myenv).returns(nil) + @interp.expects(:create_parser).with(:myenv).raises(ArgumentError) # And make sure we still get the old valid parser @interp.send(:parser, :myenv).should equal(@parser) @@ -154,27 +154,30 @@ end describe Puppet::Parser::Interpreter, " when compiling configurations" do before do @interp = Puppet::Parser::Interpreter.new + @node = stub 'node', :environment => :myenv + @compile = mock 'compile' + @parser = mock 'parser' end - it "should create a configuration with the node, parser, and whether to use ast nodes" do - node = mock('node') - node.expects(:environment).returns(:myenv) - compile = mock 'compile' - compile.expects(:compile).returns(:config) - parser = mock 'parser' - @interp.expects(:parser).with(:myenv).returns(parser) + it "should create a compile with the node, parser, and whether to use ast nodes when ast nodes is true" do + @compile.expects(:compile).returns(:config) + @interp.expects(:parser).with(:myenv).returns(@parser) @interp.expects(:usenodes?).returns(true) - Puppet::Parser::Compile.expects(:new).with(node, parser, :ast_nodes => true).returns(compile) - @interp.compile(node) + Puppet::Parser::Compile.expects(:new).with(@node, @parser, :ast_nodes => true).returns(@compile) + @interp.compile(@node) + end - # Now try it when usenodes is true - @interp = Puppet::Parser::Interpreter.new :UseNodes => false - node.expects(:environment).returns(:myenv) - compile.expects(:compile).returns(:config) - @interp.expects(:parser).with(:myenv).returns(parser) + it "should create a compile with the node, parser, and whether to use ast nodes when ast nodes is false" do + @compile.expects(:compile).returns(:config) + @interp.expects(:parser).with(:myenv).returns(@parser) @interp.expects(:usenodes?).returns(false) - Puppet::Parser::Compile.expects(:new).with(node, parser, :ast_nodes => false).returns(compile) - @interp.compile(node).should equal(:config) + Puppet::Parser::Compile.expects(:new).with(@node, @parser, :ast_nodes => false).returns(@compile) + @interp.compile(@node).should equal(:config) + end + + it "should fail intelligently when no parser can be found" do + @interp.expects(:parser).with(:myenv).returns(nil) + proc { @interp.compile(@node) }.should raise_error(Puppet::ParseError) end end -- cgit From d4afe39fa1aeb4f4e9d1bcdaf0f924aac2f00584 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 3 Oct 2007 17:50:50 -0500 Subject: Fixing #813 -- empty configurations again work. --- lib/puppet/node/configuration.rb | 5 +++-- spec/unit/node/configuration.rb | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/puppet/node/configuration.rb b/lib/puppet/node/configuration.rb index 53f63d003..3571eecda 100644 --- a/lib/puppet/node/configuration.rb +++ b/lib/puppet/node/configuration.rb @@ -226,9 +226,10 @@ class Puppet::Node::Configuration < Puppet::PGraph raise Puppet::DevError, "Could not find 'main' class; cannot generate configuration" end - # Retrive the bucket for the top-level scope and set the appropriate metadata. + # Retrieve the bucket for the top-level scope and set the appropriate metadata. unless result = buckets[main.to_s] - raise Puppet::DevError, "Did not evaluate top scope" + # This only happens when the configuration is entirely empty. + result = buckets[main.to_s] = main.to_trans end result.classes = classes diff --git a/spec/unit/node/configuration.rb b/spec/unit/node/configuration.rb index 8ba55f50c..6893c8581 100755 --- a/spec/unit/node/configuration.rb +++ b/spec/unit/node/configuration.rb @@ -68,6 +68,23 @@ describe Puppet::Node::Configuration, " when extracting transobjects" do Puppet::Parser::Resource.new(:type => type, :title => name, :source => @source, :scope => @scope) end + it "should always create a TransBucket for the 'main' class" do + config = Puppet::Node::Configuration.new("mynode") + + @scope = mkscope + @source = mock 'source' + + main = mkresource("class", :main) + config.add_vertex!(main) + + bucket = mock 'bucket' + bucket.expects(:classes=).with(config.classes) + main.stubs(:builtin?).returns(false) + main.expects(:to_transbucket).returns(bucket) + + config.extract_to_transportable.should equal(bucket) + end + # This isn't really a spec-style test, but I don't know how better to do it. it "should transform the resource graph into a tree of TransBuckets and TransObjects" do config = Puppet::Node::Configuration.new("mynode") -- cgit From 7c8fc8b9bd5aeb406f777f36df5fc52b7db5f454 Mon Sep 17 00:00:00 2001 From: "Michael V. O'Brien" Date: Wed, 3 Oct 2007 18:00:52 -0500 Subject: Fixed #854. --- lib/puppet/parser/functions.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 7ffdb6ccb..3e5417eef 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -200,11 +200,9 @@ module Functions end newfunction(:template, :type => :rvalue, :doc => "Evaluate a template and - return its value. See `the templating docs`_ + return its value. See `the templating docs `_ for more information. Note that if multiple templates are specified, their output is all concatenated and returned as the output of the function. - - .. _the templating docs: /trac/puppet/wiki/PuppetTemplating ") do |vals| require 'erb' -- cgit From 782bc4d3b037684f472e1db53c1878390b8c9a32 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 3 Oct 2007 19:34:45 -0500 Subject: Fixing the yaml path so that it is correctly created for puppetmasterd. --- lib/puppet/defaults.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index f76ae9b84..45fe0f5b0 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -131,7 +131,9 @@ module Puppet :diff => ["diff", "Which diff command to use when printing differences between files."], :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. - This feature currently requires the ``diff/lcs`` Ruby library."] + This feature currently requires the ``diff/lcs`` Ruby library."], + :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750", + :desc => "The directory in which YAML data is stored, usually in a subdirectory."} ) hostname = Facter["hostname"].value @@ -503,11 +505,6 @@ module Puppet "The backend store to use for storing files by checksum (i.e., filebuckets)."] ) - self.setdefaults(:yaml, - :yamldir => ["$vardir/yaml", - "The directory in which YAML data is stored, usually in a subdirectory."] - ) - self.setdefaults(:rails, :dblocation => { :default => "$statedir/clientconfigs.sqlite3", :mode => 0660, -- cgit From bb3b3cedf4082dc884e41b864fa755057d20e228 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 3 Oct 2007 19:36:35 -0500 Subject: I finally tracked down the problem that was causing providers to sometimes suddenly disappear and thus tests to fail -- Kernel.require was not loading the normal ruby path (e.g., 'puppet/type/cron'), so if someone else loaded that then it would replace the in-memory type with a new one, but that new one couldn't load its own providers, because the Kernel would ignore the providers, thinking they were already loaded. This doesn't fix all of the autoloading problems, but at least we won't suddenly break a ton of tests. --- lib/puppet/dsl.rb | 104 ------------------------------------- lib/puppet/provider/parsedfile.rb | 2 +- lib/puppet/util/autoload.rb | 9 +--- test/other/dsl.rb | 1 - test/ral/providers/cron/crontab.rb | 17 +++--- test/ral/types/cron.rb | 6 +-- test/util/autoload.rb | 21 ++++++++ 7 files changed, 33 insertions(+), 127 deletions(-) diff --git a/lib/puppet/dsl.rb b/lib/puppet/dsl.rb index 3696cd9ee..166745359 100644 --- a/lib/puppet/dsl.rb +++ b/lib/puppet/dsl.rb @@ -270,108 +270,4 @@ end @aspects = {} -class Puppet::DisabledDSL - @@subs = {} - @name = :DSLClass - class << self - include Enumerable - attr_accessor :included, :name, :objects - - def each - @@subs.each do |name, sub| - yield name, sub - end - end - - def export - bucket = nil - if superclass() != Puppet::DSL - bucket = superclass.export - else - bucket = Puppet::TransBucket.new - bucket.keyword = "class" - bucket.type = self.name - end - - @objects.each do |type, ary| - ary.each do |name, obj| - if pobj = bucket.find { |sobj| obj.name == sobj.name && obj.type == sobj.type } - obj.each do |param, value| - pobj[param] = value - end - else - bucket.push obj - end - end - end - - return bucket - end - - def include(name) - if ary = @@subs.find { |n, s| n == name } - ary[1].included = true - else - raise "Could not find class %s" % name - end - end - - def inherited(sub) - name = sub.to_s.downcase.gsub(/.+::/, '').intern - @@subs[name] = sub - sub.name = name - sub.initvars - - sub - end - - def initvars - #if superclass() == Puppet::DSL - @objects = {} - #else - # @objects = superclass.objects - #end - end - - - def import(file) - text = File.read(file) - # If they don't specify a parent class, then specify one - # for them. - text.gsub!(/^class \S+\s*$/) do |match| - "#{match} < Puppet::DSL" - end - eval(text, binding) - end - - def method_missing(method, *args) - if klass = Puppet::Type.type(method) - method = method.intern if method.is_a? String - @objects[method] ||= {} - - names = args.shift - hash = args.shift - names = [names] unless names.is_a? Array - names.each do |name| - unless obj = @objects[method][name] - obj = Puppet::TransObject.new(name, method) - @objects[method][name] = obj - end - - hash.each do |param, value| - if obj[param] - raise "Cannot override %s in %s[%s]" % - [param, method, name] - else - obj[param] = value - end - end - end - else - raise "No type %s" % method - end - end - end -end - # $Id$ diff --git a/lib/puppet/provider/parsedfile.rb b/lib/puppet/provider/parsedfile.rb index 338694fff..b0c0f4d44 100755 --- a/lib/puppet/provider/parsedfile.rb +++ b/lib/puppet/provider/parsedfile.rb @@ -245,7 +245,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider # Initialize the object if necessary. def self.target_object(target) - @target_objects[target] ||= @filetype.new(target) + @target_objects[target] ||= filetype.new(target) @target_objects[target] end 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/test/other/dsl.rb b/test/other/dsl.rb index 59610cd0f..0d891bf1a 100755 --- a/test/other/dsl.rb +++ b/test/other/dsl.rb @@ -4,7 +4,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppet/dsl' -require 'puppet/util/autoload' require 'puppettest' class TestDSL < Test::Unit::TestCase diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb index 7df7bab3d..d32a9527a 100755 --- a/test/ral/providers/cron/crontab.rb +++ b/test/ral/providers/cron/crontab.rb @@ -52,7 +52,6 @@ class TestCronParsedProvider < Test::Unit::TestCase def teardown Puppet::Util::FileType.filetype(:ram).clear - @provider.filetype = @oldfiletype @provider.clear super end @@ -211,7 +210,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Take our sample files, and make sure we can entirely parse them, # then that we can generate them again and we get the same data. def test_parse_and_generate_sample_files - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) crondir = datadir(File.join(%w{providers cron})) files = Dir.glob("%s/crontab.*" % crondir) @@ -306,7 +305,7 @@ class TestCronParsedProvider < Test::Unit::TestCase str = "# this is a comment\n#and another comment\n" user = "fakeuser" records = nil - target = @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) target = @provider.target_object(user) target.write(str) assert_nothing_raised { @@ -320,7 +319,7 @@ class TestCronParsedProvider < Test::Unit::TestCase end def test_simpleparsing - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) text = "5 1,2 * 1 0 /bin/echo funtest" records = nil @@ -376,7 +375,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Make sure we correctly bidirectionally parse things. def test_records_and_strings - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) setme target = @provider.target_object(@me) @@ -426,7 +425,7 @@ class TestCronParsedProvider < Test::Unit::TestCase 0,30 * * 1 * fooness " setme - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) you = "you" # Write the same tab to multiple targets @@ -486,7 +485,7 @@ class TestCronParsedProvider < Test::Unit::TestCase def test_data setme - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) target = @provider.target_object(@me) fakedata("data/providers/cron/examples").each do |file| text = File.read(file) @@ -518,7 +517,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Match freebsd's annoying @daily stuff. def test_match_freebsd_special - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) setme target = @provider.target_object(@me) @@ -561,7 +560,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # Testing #669. def test_environment_settings - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) setme target = @provider.target_object(@me) diff --git a/test/ral/types/cron.rb b/test/ral/types/cron.rb index 1695befac..519ff1d28 100755 --- a/test/ral/types/cron.rb +++ b/test/ral/types/cron.rb @@ -17,8 +17,7 @@ class TestCron < Test::Unit::TestCase @crontype = Puppet::Type.type(:cron) @provider = @crontype.defaultprovider if @provider.respond_to?(:filetype=) - @oldfiletype = @provider.filetype - @provider.filetype = :ram + @provider.stubs(:filetype).returns(Puppet::Util::FileType.filetype(:ram)) end @crontype = Puppet::Type.type(:cron) end @@ -26,9 +25,6 @@ class TestCron < Test::Unit::TestCase def teardown super @crontype.defaultprovider = nil - if defined? @oldfiletype - @provider.filetype = @oldfiletype - end Puppet::Util::FileType.filetype(:ram).clear end diff --git a/test/util/autoload.rb b/test/util/autoload.rb index bae6d37d4..ca77572c2 100755 --- a/test/util/autoload.rb +++ b/test/util/autoload.rb @@ -102,4 +102,25 @@ TestAutoload.newthing(:#{name.to_s}) assert(loader.send(:searchpath).include?(dir), "searchpath does not include the libdir") end + + # This causes very strange behaviour in the tests. We need to make sure we + # require the same path that a user would use, otherwise we'll result in + # a reload of the + def test_require_does_not_cause_reload + loadname = "testing" + loader = Puppet::Util::Autoload.new(self.class, loadname) + + basedir = "/some/dir" + dir = File.join(basedir, loadname) + loader.expects(:eachdir).yields(dir) + + subname = "instance" + + file = File.join(dir, subname) + ".rb" + + Dir.expects(:glob).with("#{dir}/*.rb").returns(file) + + Kernel.expects(:require).with(File.join(loadname, subname)) + loader.loadall + end end -- cgit From fd11603fe47668ba72f0d3f2b984174331a0a154 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 3 Oct 2007 21:55:41 -0500 Subject: Removing the Id tags from all of the files --- bin/filebucket | 1 - bin/puppetca | 1 - bin/puppetd | 1 - bin/puppetdoc | 1 - bin/puppetmasterd | 1 - bin/puppetrun | 1 - bin/ralsh | 1 - install.rb | 1 - lib/puppet.rb | 1 - lib/puppet/daemon.rb | 1 - lib/puppet/defaults.rb | 1 - lib/puppet/dsl.rb | 1 - lib/puppet/event.rb | 1 - lib/puppet/external/gratr/rdot.rb | 1 - lib/puppet/external/lock.rb | 1 - lib/puppet/feature/rails.rb | 1 - lib/puppet/metatype/attributes.rb | 1 - lib/puppet/metatype/closure.rb | 1 - lib/puppet/metatype/container.rb | 1 - lib/puppet/metatype/evaluation.rb | 1 - lib/puppet/metatype/instances.rb | 1 - lib/puppet/metatype/manager.rb | 1 - lib/puppet/metatype/metaparams.rb | 1 - lib/puppet/metatype/relationships.rb | 1 - lib/puppet/metatype/schedules.rb | 1 - lib/puppet/metatype/tags.rb | 1 - lib/puppet/network/authconfig.rb | 1 - lib/puppet/network/authorization.rb | 1 - lib/puppet/network/authstore.rb | 1 - lib/puppet/network/client.rb | 1 - lib/puppet/network/client/ca.rb | 1 - lib/puppet/network/client/dipper.rb | 1 - lib/puppet/network/client/file.rb | 1 - lib/puppet/network/client/proxy.rb | 1 - lib/puppet/network/client/report.rb | 1 - lib/puppet/network/client/resource.rb | 1 - lib/puppet/network/client/runner.rb | 1 - lib/puppet/network/client/status.rb | 1 - lib/puppet/network/client_request.rb | 1 - lib/puppet/network/handler.rb | 1 - lib/puppet/network/handler/ca.rb | 1 - lib/puppet/network/handler/filebucket.rb | 1 - lib/puppet/network/handler/fileserver.rb | 1 - lib/puppet/network/handler/report.rb | 1 - lib/puppet/network/handler/resource.rb | 1 - lib/puppet/network/handler/runner.rb | 1 - lib/puppet/network/handler/status.rb | 1 - lib/puppet/network/rights.rb | 1 - lib/puppet/network/server.rb | 1 - lib/puppet/network/server/mongrel.rb | 1 - lib/puppet/network/server/webrick.rb | 1 - lib/puppet/network/xmlrpc/client.rb | 1 - lib/puppet/network/xmlrpc/processor.rb | 1 - lib/puppet/network/xmlrpc/server.rb | 1 - lib/puppet/network/xmlrpc/webrick_servlet.rb | 1 - lib/puppet/parameter.rb | 1 - lib/puppet/parser/ast.rb | 1 - lib/puppet/parser/functions.rb | 1 - lib/puppet/parser/lexer.rb | 1 - lib/puppet/parser/parser.rb | 1 - lib/puppet/parser/resource/param.rb | 1 - lib/puppet/parser/templatewrapper.rb | 1 - lib/puppet/property.rb | 1 - lib/puppet/provider.rb | 1 - lib/puppet/provider/cron/crontab.rb | 1 - lib/puppet/provider/group/groupadd.rb | 1 - lib/puppet/provider/group/netinfo.rb | 1 - lib/puppet/provider/group/pw.rb | 1 - lib/puppet/provider/host/netinfo.rb | 1 - lib/puppet/provider/host/parsed.rb | 1 - lib/puppet/provider/interface/redhat.rb | 1 - lib/puppet/provider/interface/sunos.rb | 1 - lib/puppet/provider/mailalias/aliases.rb | 1 - lib/puppet/provider/maillist/mailman.rb | 1 - lib/puppet/provider/mount/netinfo.rb | 1 - lib/puppet/provider/mount/parsed.rb | 1 - lib/puppet/provider/nameservice.rb | 1 - lib/puppet/provider/nameservice/netinfo.rb | 1 - lib/puppet/provider/nameservice/objectadd.rb | 1 - lib/puppet/provider/nameservice/pw.rb | 1 - lib/puppet/provider/package.rb | 1 - lib/puppet/provider/package/appdmg.rb | 1 - lib/puppet/provider/package/apple.rb | 1 - lib/puppet/provider/package/apt.rb | 1 - lib/puppet/provider/package/aptitude.rb | 1 - lib/puppet/provider/package/aptrpm.rb | 1 - lib/puppet/provider/package/blastwave.rb | 1 - lib/puppet/provider/package/darwinport.rb | 1 - lib/puppet/provider/package/dpkg.rb | 1 - lib/puppet/provider/package/fink.rb | 1 - lib/puppet/provider/package/freebsd.rb | 1 - lib/puppet/provider/package/gem.rb | 1 - lib/puppet/provider/package/openbsd.rb | 1 - lib/puppet/provider/package/pkgdmg.rb | 1 - lib/puppet/provider/package/portage.rb | 1 - lib/puppet/provider/package/ports.rb | 1 - lib/puppet/provider/package/rpm.rb | 1 - lib/puppet/provider/package/sun.rb | 1 - lib/puppet/provider/package/sunfreeware.rb | 1 - lib/puppet/provider/package/up2date.rb | 1 - lib/puppet/provider/package/urpmi.rb | 1 - lib/puppet/provider/package/yum.rb | 1 - lib/puppet/provider/parsedfile.rb | 1 - lib/puppet/provider/port/parsed.rb | 1 - lib/puppet/provider/service/base.rb | 1 - lib/puppet/provider/service/debian.rb | 1 - lib/puppet/provider/service/init.rb | 1 - lib/puppet/provider/service/redhat.rb | 1 - lib/puppet/provider/service/smf.rb | 1 - lib/puppet/provider/sshkey/parsed.rb | 1 - lib/puppet/provider/user/netinfo.rb | 1 - lib/puppet/provider/user/pw.rb | 1 - lib/puppet/provider/user/useradd.rb | 1 - lib/puppet/provider/zone/solaris.rb | 1 - lib/puppet/rails.rb | 1 - lib/puppet/rails/database/schema.rb | 1 - lib/puppet/rails/host.rb | 1 - lib/puppet/rails/param_name.rb | 1 - lib/puppet/rails/param_value.rb | 1 - lib/puppet/rails/puppet_class.rb | 1 - lib/puppet/relationship.rb | 1 - lib/puppet/reports/log.rb | 1 - lib/puppet/reports/rrdgraph.rb | 1 - lib/puppet/reports/store.rb | 1 - lib/puppet/reports/tagmail.rb | 1 - lib/puppet/sslcertificates.rb | 1 - lib/puppet/sslcertificates/ca.rb | 1 - lib/puppet/sslcertificates/certificate.rb | 1 - lib/puppet/sslcertificates/inventory.rb | 1 - lib/puppet/sslcertificates/support.rb | 1 - lib/puppet/transaction.rb | 1 - lib/puppet/transaction/report.rb | 1 - lib/puppet/type.rb | 1 - lib/puppet/type/cron.rb | 1 - lib/puppet/type/exec.rb | 1 - lib/puppet/type/group.rb | 1 - lib/puppet/type/host.rb | 1 - lib/puppet/type/interface.rb | 1 - lib/puppet/type/mailalias.rb | 1 - lib/puppet/type/maillist.rb | 1 - lib/puppet/type/mount.rb | 1 - lib/puppet/type/notify.rb | 1 - lib/puppet/type/package.rb | 1 - lib/puppet/type/pfile.rb | 1 - lib/puppet/type/pfile/checksum.rb | 1 - lib/puppet/type/pfile/ensure.rb | 1 - lib/puppet/type/pfile/group.rb | 1 - lib/puppet/type/pfile/mode.rb | 1 - lib/puppet/type/pfile/owner.rb | 1 - lib/puppet/type/pfile/target.rb | 1 - lib/puppet/type/pfile/type.rb | 1 - lib/puppet/type/pfilebucket.rb | 1 - lib/puppet/type/port.rb | 1 - lib/puppet/type/resources.rb | 1 - lib/puppet/type/schedule.rb | 1 - lib/puppet/type/service.rb | 1 - lib/puppet/type/sshkey.rb | 1 - lib/puppet/type/tidy.rb | 1 - lib/puppet/type/user.rb | 1 - lib/puppet/type/zone.rb | 1 - lib/puppet/util.rb | 1 - lib/puppet/util/classgen.rb | 1 - lib/puppet/util/docs.rb | 1 - lib/puppet/util/errors.rb | 1 - lib/puppet/util/execution.rb | 1 - lib/puppet/util/fact_store.rb | 1 - lib/puppet/util/fileparsing.rb | 1 - lib/puppet/util/filetype.rb | 1 - lib/puppet/util/graph.rb | 1 - lib/puppet/util/inifile.rb | 1 - lib/puppet/util/loadedfile.rb | 1 - lib/puppet/util/log.rb | 1 - lib/puppet/util/log_paths.rb | 1 - lib/puppet/util/logging.rb | 1 - lib/puppet/util/metaid.rb | 1 - lib/puppet/util/metric.rb | 1 - lib/puppet/util/plist.rb | 1 - lib/puppet/util/plist/generator.rb | 1 - lib/puppet/util/plist/parser.rb | 1 - lib/puppet/util/posix.rb | 1 - lib/puppet/util/provider_features.rb | 1 - lib/puppet/util/rails/collection_merger.rb | 1 - lib/puppet/util/reference.rb | 1 - lib/puppet/util/subclass_loader.rb | 1 - lib/puppet/util/suidmanager.rb | 1 - lib/puppet/util/variables.rb | 1 - lib/puppet/util/warnings.rb | 1 - spec/unit/other/transobject.rb | 1 - test/certmgr/ca.rb | 1 - test/certmgr/certmgr.rb | 1 - test/certmgr/inventory.rb | 1 - test/certmgr/support.rb | 1 - test/executables/filebucket.rb | 1 - test/executables/puppetbin.rb | 1 - test/executables/puppetca.rb | 1 - test/executables/puppetd.rb | 1 - test/executables/puppetmasterd.rb | 1 - test/executables/puppetmodule.rb | 1 - test/language/ast/casestatement.rb | 1 - test/language/ast/selector.rb | 1 - test/language/ast/variable.rb | 1 - test/language/functions.rb | 1 - test/language/lexer.rb | 1 - test/language/parser.rb | 1 - test/language/scope.rb | 1 - test/language/transportable.rb | 1 - test/lib/puppettest.rb | 1 - test/lib/puppettest/certificates.rb | 1 - test/lib/puppettest/exetest.rb | 1 - test/lib/puppettest/fakes.rb | 1 - test/lib/puppettest/fileparsing.rb | 1 - test/lib/puppettest/filetesting.rb | 1 - test/lib/puppettest/railstesting.rb | 1 - test/lib/puppettest/reporttesting.rb | 1 - test/lib/puppettest/resourcetesting.rb | 1 - test/lib/puppettest/servertest.rb | 1 - test/lib/puppettest/support/collection.rb | 1 - test/lib/puppettest/support/helpers.rb | 1 - test/lib/puppettest/support/utils.rb | 1 - test/lib/rake/puppet_test_loader.rb | 1 - test/lib/rake/puppet_testtask.rb | 1 - test/network/authconfig.rb | 1 - test/network/authorization.rb | 1 - test/network/authstore.rb | 1 - test/network/client/ca.rb | 1 - test/network/client/client.rb | 1 - test/network/client/dipper.rb | 1 - test/network/client/resource.rb | 1 - test/network/client_request.rb | 1 - test/network/daemon.rb | 1 - test/network/handler/bucket.rb | 1 - test/network/handler/ca.rb | 1 - test/network/handler/fileserver.rb | 1 - test/network/handler/handler.rb | 1 - test/network/handler/master.rb | 1 - test/network/handler/report.rb | 1 - test/network/handler/resource.rb | 1 - test/network/handler/runner.rb | 1 - test/network/rights.rb | 1 - test/network/server/mongrel_test.rb | 1 - test/network/server/webrick.rb | 1 - test/network/xmlrpc/client.rb | 1 - test/network/xmlrpc/processor.rb | 1 - test/network/xmlrpc/server.rb | 1 - test/network/xmlrpc/webrick_servlet.rb | 1 - test/other/events.rb | 1 - test/other/overrides.rb | 1 - test/other/propertychange.rb | 1 - test/other/provider.rb | 1 - test/other/puppet.rb | 1 - test/other/relationship.rb | 1 - test/other/relationships.rb | 1 - test/other/report.rb | 1 - test/puppet/conffiles.rb | 1 - test/puppet/defaults.rb | 1 - test/puppet/errortest.rb | 1 - test/puppet/tc_suidmanager.rb | 1 - test/rails/ast.rb | 1 - test/rails/collection.rb | 1 - test/rails/host.rb | 1 - test/rails/rails.rb | 1 - test/rails/railsparameter.rb | 1 - test/rails/railsresource.rb | 1 - test/ral/manager/attributes.rb | 1 - test/ral/manager/instances.rb | 1 - test/ral/manager/manager.rb | 1 - test/ral/manager/provider.rb | 1 - test/ral/providers/cron/crontab.rb | 1 - test/ral/providers/group.rb | 1 - test/ral/providers/host/netinfo.rb | 1 - test/ral/providers/host/parsed.rb | 1 - test/ral/providers/mailalias/aliases.rb | 1 - test/ral/providers/mount/netinfo.rb | 1 - test/ral/providers/mount/parsed.rb | 1 - test/ral/providers/nameservice.rb | 1 - test/ral/providers/package.rb | 1 - test/ral/providers/package/apt.rb | 1 - test/ral/providers/package/aptrpm.rb | 1 - test/ral/providers/parsedfile.rb | 1 - test/ral/providers/port/parsed.rb | 1 - test/ral/providers/provider.rb | 1 - test/ral/providers/service.rb | 1 - test/ral/providers/service/base.rb | 1 - test/ral/providers/sshkey/parsed.rb | 1 - test/ral/providers/user.rb | 1 - test/ral/providers/user/useradd.rb | 1 - test/ral/types/cron.rb | 1 - test/ral/types/exec.rb | 1 - test/ral/types/file.rb | 1 - test/ral/types/file/target.rb | 1 - test/ral/types/filebucket.rb | 1 - test/ral/types/filesources.rb | 1 - test/ral/types/host.rb | 1 - test/ral/types/interface.rb | 1 - test/ral/types/mailalias.rb | 1 - test/ral/types/mount.rb | 1 - test/ral/types/package.rb | 1 - test/ral/types/parameter.rb | 1 - test/ral/types/port.rb | 1 - test/ral/types/property.rb | 1 - test/ral/types/resources.rb | 1 - test/ral/types/schedule.rb | 1 - test/ral/types/service.rb | 1 - test/ral/types/sshkey.rb | 1 - test/ral/types/tidy.rb | 1 - test/ral/types/user.rb | 1 - test/ral/types/zone.rb | 1 - test/util/classgen.rb | 1 - test/util/execution.rb | 1 - test/util/fileparsing.rb | 1 - test/util/filetype.rb | 1 - test/util/instance_loader.rb | 1 - test/util/loadedfile.rb | 1 - test/util/log.rb | 1 - test/util/metrics.rb | 1 - test/util/package.rb | 1 - test/util/posixtest.rb | 1 - test/util/settings.rb | 1 - test/util/storage.rb | 1 - test/util/subclass_loader.rb | 1 - test/util/utiltest.rb | 1 - 321 files changed, 321 deletions(-) diff --git a/bin/filebucket b/bin/filebucket index 22580cbe3..5790c9460 100755 --- a/bin/filebucket +++ b/bin/filebucket @@ -209,4 +209,3 @@ else raise "Invalid mode %s" % mode end -# $Id$ diff --git a/bin/puppetca b/bin/puppetca index 72b2640a3..ce78118bc 100755 --- a/bin/puppetca +++ b/bin/puppetca @@ -286,4 +286,3 @@ else exit(42) end -# $Id$ diff --git a/bin/puppetd b/bin/puppetd index 6450d1806..a09d3c73b 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -447,4 +447,3 @@ else Puppet.start end -# $Id$ diff --git a/bin/puppetdoc b/bin/puppetdoc index d373eb0ca..11f9818a9 100755 --- a/bin/puppetdoc +++ b/bin/puppetdoc @@ -150,4 +150,3 @@ else end -# $Id$ diff --git a/bin/puppetmasterd b/bin/puppetmasterd index acbafa59c..f764b1901 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -291,4 +291,3 @@ when "mongrel": webserver.run.join end -# $Id$ diff --git a/bin/puppetrun b/bin/puppetrun index 1aa0b295b..cc78f81a8 100755 --- a/bin/puppetrun +++ b/bin/puppetrun @@ -402,4 +402,3 @@ while go end -# $Id$ diff --git a/bin/ralsh b/bin/ralsh index e4df0f0e1..58c96c930 100755 --- a/bin/ralsh +++ b/bin/ralsh @@ -267,4 +267,3 @@ else puts text end -# $Id$ diff --git a/install.rb b/install.rb index 7e84bfceb..ad7172cee 100755 --- a/install.rb +++ b/install.rb @@ -30,7 +30,6 @@ # 5) Install all library files ending in .rb from lib/ into Ruby's # site_lib/version directory. # -# $Id$ #++ require 'rbconfig' diff --git a/lib/puppet.rb b/lib/puppet.rb index 538a3335f..c09ec5971 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -430,4 +430,3 @@ if Puppet[:storeconfigs] require 'puppet/rails' end -# $Id$ diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index 52197f562..24d743764 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -81,4 +81,3 @@ module Puppet::Daemon end end -# $Id$ diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 6f44919e2..073cdb1dc 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -659,4 +659,3 @@ module Puppet ) end -# $Id$ diff --git a/lib/puppet/dsl.rb b/lib/puppet/dsl.rb index 3696cd9ee..614e180f2 100644 --- a/lib/puppet/dsl.rb +++ b/lib/puppet/dsl.rb @@ -374,4 +374,3 @@ class Puppet::DisabledDSL end end -# $Id$ diff --git a/lib/puppet/event.rb b/lib/puppet/event.rb index 16e76bf50..c1928a354 100644 --- a/lib/puppet/event.rb +++ b/lib/puppet/event.rb @@ -26,4 +26,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/external/gratr/rdot.rb b/lib/puppet/external/gratr/rdot.rb index 4ce545ae6..b94568c12 100644 --- a/lib/puppet/external/gratr/rdot.rb +++ b/lib/puppet/external/gratr/rdot.rb @@ -1,6 +1,5 @@ # rdot.rb # -# $Id$ # # This is a modified version of dot.rb from Dave Thomas's rdoc project. I [Horst Duchene] # renamed it to rdot.rb to avoid collision with an installed rdoc/dot. diff --git a/lib/puppet/external/lock.rb b/lib/puppet/external/lock.rb index d873d1bbf..5213f5657 100644 --- a/lib/puppet/external/lock.rb +++ b/lib/puppet/external/lock.rb @@ -61,4 +61,3 @@ class File end end -# $Id$ diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb index 34407de66..63e6f00bc 100644 --- a/lib/puppet/feature/rails.rb +++ b/lib/puppet/feature/rails.rb @@ -49,4 +49,3 @@ Puppet.features.add(:rails) do end end -# $Id$ diff --git a/lib/puppet/metatype/attributes.rb b/lib/puppet/metatype/attributes.rb index 0ceb7f161..dc59ce6b6 100644 --- a/lib/puppet/metatype/attributes.rb +++ b/lib/puppet/metatype/attributes.rb @@ -688,4 +688,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/closure.rb b/lib/puppet/metatype/closure.rb index 727bc6884..46e3c873f 100644 --- a/lib/puppet/metatype/closure.rb +++ b/lib/puppet/metatype/closure.rb @@ -95,4 +95,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/container.rb b/lib/puppet/metatype/container.rb index 7bbccf8a0..2bbe3f546 100644 --- a/lib/puppet/metatype/container.rb +++ b/lib/puppet/metatype/container.rb @@ -48,4 +48,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/evaluation.rb b/lib/puppet/metatype/evaluation.rb index b358fefad..0451d50a7 100644 --- a/lib/puppet/metatype/evaluation.rb +++ b/lib/puppet/metatype/evaluation.rb @@ -162,4 +162,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/instances.rb b/lib/puppet/metatype/instances.rb index 4af230b28..2f9918067 100644 --- a/lib/puppet/metatype/instances.rb +++ b/lib/puppet/metatype/instances.rb @@ -314,4 +314,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb index 2df2de489..e95b6fd07 100644 --- a/lib/puppet/metatype/manager.rb +++ b/lib/puppet/metatype/manager.rb @@ -139,4 +139,3 @@ module Manager end end -# $Id$ diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb index 92f12e6cb..1ab3f26c1 100644 --- a/lib/puppet/metatype/metaparams.rb +++ b/lib/puppet/metatype/metaparams.rb @@ -414,4 +414,3 @@ class Puppet::Type end end # Puppet::Type -# $Id$ diff --git a/lib/puppet/metatype/relationships.rb b/lib/puppet/metatype/relationships.rb index 494407e68..c7a0a91ee 100644 --- a/lib/puppet/metatype/relationships.rb +++ b/lib/puppet/metatype/relationships.rb @@ -113,4 +113,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/schedules.rb b/lib/puppet/metatype/schedules.rb index 5cd242148..96ebce0ab 100644 --- a/lib/puppet/metatype/schedules.rb +++ b/lib/puppet/metatype/schedules.rb @@ -31,4 +31,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/metatype/tags.rb b/lib/puppet/metatype/tags.rb index 2a78d89ec..1d96306dd 100644 --- a/lib/puppet/metatype/tags.rb +++ b/lib/puppet/metatype/tags.rb @@ -36,4 +36,3 @@ class Puppet::Type end end -# $Id$ diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb index ebf005022..8e3773719 100644 --- a/lib/puppet/network/authconfig.rb +++ b/lib/puppet/network/authconfig.rb @@ -165,4 +165,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/network/authorization.rb b/lib/puppet/network/authorization.rb index a3c1d50e1..9ea4bf69e 100644 --- a/lib/puppet/network/authorization.rb +++ b/lib/puppet/network/authorization.rb @@ -81,4 +81,3 @@ module Puppet::Network end end -# $Id$ diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb index 9af118e09..c16bef32f 100755 --- a/lib/puppet/network/authstore.rb +++ b/lib/puppet/network/authstore.rb @@ -294,4 +294,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index 351888c9e..7950abe3f 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -190,4 +190,3 @@ class Puppet::Network::Client require 'puppet/network/client/proxy' end -# $Id$ diff --git a/lib/puppet/network/client/ca.rb b/lib/puppet/network/client/ca.rb index 46fb9f51f..a2704e451 100644 --- a/lib/puppet/network/client/ca.rb +++ b/lib/puppet/network/client/ca.rb @@ -56,4 +56,3 @@ class Puppet::Network::Client::CA < Puppet::Network::Client end end -# $Id$ diff --git a/lib/puppet/network/client/dipper.rb b/lib/puppet/network/client/dipper.rb index c16e37725..0ec7087e5 100644 --- a/lib/puppet/network/client/dipper.rb +++ b/lib/puppet/network/client/dipper.rb @@ -78,4 +78,3 @@ class Puppet::Network::Client::Dipper < Puppet::Network::Client end end -# $Id$ diff --git a/lib/puppet/network/client/file.rb b/lib/puppet/network/client/file.rb index 381a10cdb..6dd2adab2 100644 --- a/lib/puppet/network/client/file.rb +++ b/lib/puppet/network/client/file.rb @@ -4,4 +4,3 @@ class Puppet::Network::Client::File < Puppet::Network::Client::ProxyClient self.mkmethods end -# $Id$ diff --git a/lib/puppet/network/client/proxy.rb b/lib/puppet/network/client/proxy.rb index 4cd37bb5d..17b1b0e14 100644 --- a/lib/puppet/network/client/proxy.rb +++ b/lib/puppet/network/client/proxy.rb @@ -25,4 +25,3 @@ class Puppet::Network::Client::ProxyClient < Puppet::Network::Client end end -# $Id$ diff --git a/lib/puppet/network/client/report.rb b/lib/puppet/network/client/report.rb index cb4711afe..9bd61de2e 100644 --- a/lib/puppet/network/client/report.rb +++ b/lib/puppet/network/client/report.rb @@ -28,4 +28,3 @@ class Puppet::Network::Client::Report < Puppet::Network::Client end end -# $Id$ diff --git a/lib/puppet/network/client/resource.rb b/lib/puppet/network/client/resource.rb index bf026dff0..bc4a8e53f 100644 --- a/lib/puppet/network/client/resource.rb +++ b/lib/puppet/network/client/resource.rb @@ -49,4 +49,3 @@ class Puppet::Network::Client::Resource < Puppet::Network::Client end end -# $Id$ diff --git a/lib/puppet/network/client/runner.rb b/lib/puppet/network/client/runner.rb index 12097c52f..5806dd343 100644 --- a/lib/puppet/network/client/runner.rb +++ b/lib/puppet/network/client/runner.rb @@ -10,4 +10,3 @@ class Puppet::Network::Client::Runner < Puppet::Network::Client::ProxyClient end end -# $Id$ diff --git a/lib/puppet/network/client/status.rb b/lib/puppet/network/client/status.rb index d35e44c1a..9dc22b606 100644 --- a/lib/puppet/network/client/status.rb +++ b/lib/puppet/network/client/status.rb @@ -2,4 +2,3 @@ class Puppet::Network::Client::Status < Puppet::Network::Client::ProxyClient self.mkmethods end -# $Id$ diff --git a/lib/puppet/network/client_request.rb b/lib/puppet/network/client_request.rb index 16a9d9993..86dd31bcf 100644 --- a/lib/puppet/network/client_request.rb +++ b/lib/puppet/network/client_request.rb @@ -29,4 +29,3 @@ module Puppet::Network # :nodoc: end end -# $Id$ diff --git a/lib/puppet/network/handler.rb b/lib/puppet/network/handler.rb index c2fbfcba5..f6a658662 100644 --- a/lib/puppet/network/handler.rb +++ b/lib/puppet/network/handler.rb @@ -51,4 +51,3 @@ module Puppet::Network end end -# $Id$ diff --git a/lib/puppet/network/handler/ca.rb b/lib/puppet/network/handler/ca.rb index 052eb5c19..de7a976c8 100644 --- a/lib/puppet/network/handler/ca.rb +++ b/lib/puppet/network/handler/ca.rb @@ -155,4 +155,3 @@ class Puppet::Network::Handler end end -# $Id$ diff --git a/lib/puppet/network/handler/filebucket.rb b/lib/puppet/network/handler/filebucket.rb index 1bf8da854..38ef7f3f2 100755 --- a/lib/puppet/network/handler/filebucket.rb +++ b/lib/puppet/network/handler/filebucket.rb @@ -180,4 +180,3 @@ class Puppet::Network::Handler # :nodoc: end end -# $Id$ diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index ae0e6553d..dd00450be 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -676,4 +676,3 @@ class Puppet::Network::Handler end end -# $Id$ diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb index 62e9cfdec..e202d4e2a 100755 --- a/lib/puppet/network/handler/report.rb +++ b/lib/puppet/network/handler/report.rb @@ -142,4 +142,3 @@ class Puppet::Network::Handler end end -# $Id$ diff --git a/lib/puppet/network/handler/resource.rb b/lib/puppet/network/handler/resource.rb index 7709b85fe..0fcd694fb 100755 --- a/lib/puppet/network/handler/resource.rb +++ b/lib/puppet/network/handler/resource.rb @@ -192,4 +192,3 @@ class Puppet::Network::Handler end end -# $Id$ diff --git a/lib/puppet/network/handler/runner.rb b/lib/puppet/network/handler/runner.rb index 4b9ccab75..a8d0da9ce 100755 --- a/lib/puppet/network/handler/runner.rb +++ b/lib/puppet/network/handler/runner.rb @@ -62,4 +62,3 @@ class Puppet::Network::Handler end end -# $Id$ diff --git a/lib/puppet/network/handler/status.rb b/lib/puppet/network/handler/status.rb index 48668ca47..fbdc7a765 100644 --- a/lib/puppet/network/handler/status.rb +++ b/lib/puppet/network/handler/status.rb @@ -14,4 +14,3 @@ class Puppet::Network::Handler end end -# $Id$ diff --git a/lib/puppet/network/rights.rb b/lib/puppet/network/rights.rb index 970a7aacf..a4133f22c 100755 --- a/lib/puppet/network/rights.rb +++ b/lib/puppet/network/rights.rb @@ -71,4 +71,3 @@ class Puppet::Network::Rights < Hash end end -# $Id$ diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb index 1bf3f5f63..0dee30b10 100644 --- a/lib/puppet/network/server.rb +++ b/lib/puppet/network/server.rb @@ -2,4 +2,3 @@ module Puppet::Network::Server # :nodoc: end -# $Id$ diff --git a/lib/puppet/network/server/mongrel.rb b/lib/puppet/network/server/mongrel.rb index 5bce40756..8cd7e807b 100644 --- a/lib/puppet/network/server/mongrel.rb +++ b/lib/puppet/network/server/mongrel.rb @@ -137,4 +137,3 @@ module Puppet::Network end end -# $Id$ diff --git a/lib/puppet/network/server/webrick.rb b/lib/puppet/network/server/webrick.rb index f24411ab3..dd9a91c7c 100644 --- a/lib/puppet/network/server/webrick.rb +++ b/lib/puppet/network/server/webrick.rb @@ -161,4 +161,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index eb8d1b9ca..c652dbf8d 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -151,4 +151,3 @@ module Puppet::Network end end -# $Id$ diff --git a/lib/puppet/network/xmlrpc/processor.rb b/lib/puppet/network/xmlrpc/processor.rb index 248354696..2c2dc61ec 100644 --- a/lib/puppet/network/xmlrpc/processor.rb +++ b/lib/puppet/network/xmlrpc/processor.rb @@ -88,4 +88,3 @@ module Puppet::Network end end -# $Id$ diff --git a/lib/puppet/network/xmlrpc/server.rb b/lib/puppet/network/xmlrpc/server.rb index bd05703ba..e7435268a 100644 --- a/lib/puppet/network/xmlrpc/server.rb +++ b/lib/puppet/network/xmlrpc/server.rb @@ -17,4 +17,3 @@ module Puppet::Network end end -# $Id$ diff --git a/lib/puppet/network/xmlrpc/webrick_servlet.rb b/lib/puppet/network/xmlrpc/webrick_servlet.rb index 0ddb056dc..9a46ffb7c 100644 --- a/lib/puppet/network/xmlrpc/webrick_servlet.rb +++ b/lib/puppet/network/xmlrpc/webrick_servlet.rb @@ -118,4 +118,3 @@ module Puppet::Network::XMLRPC end end -# $Id$ diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb index 8f4baa33e..d15c1f622 100644 --- a/lib/puppet/parameter.rb +++ b/lib/puppet/parameter.rb @@ -484,4 +484,3 @@ class Puppet::Parameter end end -# $Id$ diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb index ce5e8263e..14b686e2f 100644 --- a/lib/puppet/parser/ast.rb +++ b/lib/puppet/parser/ast.rb @@ -117,4 +117,3 @@ end require 'puppet/parser/ast/leaf' -# $Id$ diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 3e5417eef..1d07122d4 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -302,4 +302,3 @@ module Functions end end -# $Id$ diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index 360ed4254..086d82c09 100644 --- a/lib/puppet/parser/lexer.rb +++ b/lib/puppet/parser/lexer.rb @@ -330,4 +330,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index b4e9b84d7..c3279d4e7 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -39,7 +39,6 @@ require 'puppet/parser/parser_support' # mode: ruby # End: -# $Id$ ..end grammar.ra modeval..id9134b179f4 diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index 4332bee85..6bde0674e 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -88,4 +88,3 @@ class Puppet::Parser::Resource::Param end end -# $Id$ diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb index f863e31aa..13823d483 100644 --- a/lib/puppet/parser/templatewrapper.rb +++ b/lib/puppet/parser/templatewrapper.rb @@ -51,4 +51,3 @@ class Puppet::Parser::TemplateWrapper end end -# $Id$ diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb index 059d7c410..cd3c35b38 100644 --- a/lib/puppet/property.rb +++ b/lib/puppet/property.rb @@ -557,4 +557,3 @@ class Property < Puppet::Parameter end end -# $Id$ diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb index 5a38f7f20..53a2c5605 100644 --- a/lib/puppet/provider.rb +++ b/lib/puppet/provider.rb @@ -372,4 +372,3 @@ class Puppet::Provider end end -# $Id$ diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb index 6539e39d3..7ddcc0505 100755 --- a/lib/puppet/provider/cron/crontab.rb +++ b/lib/puppet/provider/cron/crontab.rb @@ -198,4 +198,3 @@ Puppet::Type.type(:cron).provide(:crontab, end end -# $Id$ diff --git a/lib/puppet/provider/group/groupadd.rb b/lib/puppet/provider/group/groupadd.rb index b41ff6f93..4df5bf40d 100644 --- a/lib/puppet/provider/group/groupadd.rb +++ b/lib/puppet/provider/group/groupadd.rb @@ -26,4 +26,3 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe end end -# $Id$ diff --git a/lib/puppet/provider/group/netinfo.rb b/lib/puppet/provider/group/netinfo.rb index eb98c0066..b2174778f 100644 --- a/lib/puppet/provider/group/netinfo.rb +++ b/lib/puppet/provider/group/netinfo.rb @@ -9,4 +9,3 @@ Puppet::Type.type(:group).provide :netinfo, :parent => Puppet::Provider::NameSer defaultfor :operatingsystem => :darwin end -# $Id$ diff --git a/lib/puppet/provider/group/pw.rb b/lib/puppet/provider/group/pw.rb index d2b9611b1..3c384cd6d 100644 --- a/lib/puppet/provider/group/pw.rb +++ b/lib/puppet/provider/group/pw.rb @@ -28,4 +28,3 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService: end end -# $Id$ diff --git a/lib/puppet/provider/host/netinfo.rb b/lib/puppet/provider/host/netinfo.rb index 97a3b99e7..07a9362c5 100644 --- a/lib/puppet/provider/host/netinfo.rb +++ b/lib/puppet/provider/host/netinfo.rb @@ -14,4 +14,3 @@ Puppet::Type.type(:host).provide :netinfo, :parent => Puppet::Provider::NameServ defaultfor :operatingsystem => :darwin end -# $Id$ diff --git a/lib/puppet/provider/host/parsed.rb b/lib/puppet/provider/host/parsed.rb index e2e0786dc..a4812babe 100644 --- a/lib/puppet/provider/host/parsed.rb +++ b/lib/puppet/provider/host/parsed.rb @@ -70,4 +70,3 @@ Puppet::Type.type(:host).provide(:parsed, end end -# $Id$ diff --git a/lib/puppet/provider/interface/redhat.rb b/lib/puppet/provider/interface/redhat.rb index 2f8611811..2f9c36903 100644 --- a/lib/puppet/provider/interface/redhat.rb +++ b/lib/puppet/provider/interface/redhat.rb @@ -248,4 +248,3 @@ LOOPBACKDUMMY end end -# $Id$ diff --git a/lib/puppet/provider/interface/sunos.rb b/lib/puppet/provider/interface/sunos.rb index abe9dd8c6..6c55eae8e 100644 --- a/lib/puppet/provider/interface/sunos.rb +++ b/lib/puppet/provider/interface/sunos.rb @@ -113,4 +113,3 @@ Puppet::Type.type(:interface).provide(:sunos, end end -# $Id$ diff --git a/lib/puppet/provider/mailalias/aliases.rb b/lib/puppet/provider/mailalias/aliases.rb index e3bf2c59f..85dec29cc 100755 --- a/lib/puppet/provider/mailalias/aliases.rb +++ b/lib/puppet/provider/mailalias/aliases.rb @@ -28,4 +28,3 @@ Puppet::Type.type(:mailalias).provide(:aliases, end end -# $Id$ diff --git a/lib/puppet/provider/maillist/mailman.rb b/lib/puppet/provider/maillist/mailman.rb index 903689178..4e225fe0a 100755 --- a/lib/puppet/provider/maillist/mailman.rb +++ b/lib/puppet/provider/maillist/mailman.rb @@ -110,4 +110,3 @@ Puppet::Type.type(:maillist).provide(:mailman) do end end -# $Id$ diff --git a/lib/puppet/provider/mount/netinfo.rb b/lib/puppet/provider/mount/netinfo.rb index ca3aee107..2cb125776 100644 --- a/lib/puppet/provider/mount/netinfo.rb +++ b/lib/puppet/provider/mount/netinfo.rb @@ -35,4 +35,3 @@ require 'puppet/provider/mount' # end # end -# $Id$ diff --git a/lib/puppet/provider/mount/parsed.rb b/lib/puppet/provider/mount/parsed.rb index fa4383eb2..20908333d 100755 --- a/lib/puppet/provider/mount/parsed.rb +++ b/lib/puppet/provider/mount/parsed.rb @@ -34,4 +34,3 @@ Puppet::Type.type(:mount).provide(:parsed, record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => [:pass, :dump] end -# $Id$ diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb index bc205d43a..bba6c98ad 100644 --- a/lib/puppet/provider/nameservice.rb +++ b/lib/puppet/provider/nameservice.rb @@ -329,4 +329,3 @@ class Puppet::Provider::NameService < Puppet::Provider end end -# $Id$ diff --git a/lib/puppet/provider/nameservice/netinfo.rb b/lib/puppet/provider/nameservice/netinfo.rb index f03e67445..29600052b 100644 --- a/lib/puppet/provider/nameservice/netinfo.rb +++ b/lib/puppet/provider/nameservice/netinfo.rb @@ -207,4 +207,3 @@ class NetInfo < Puppet::Provider::NameService end end -# $Id$ diff --git a/lib/puppet/provider/nameservice/objectadd.rb b/lib/puppet/provider/nameservice/objectadd.rb index f7865185d..8ebf8924b 100644 --- a/lib/puppet/provider/nameservice/objectadd.rb +++ b/lib/puppet/provider/nameservice/objectadd.rb @@ -42,4 +42,3 @@ class ObjectAdd < Puppet::Provider::NameService end end -# $Id$ diff --git a/lib/puppet/provider/nameservice/pw.rb b/lib/puppet/provider/nameservice/pw.rb index 0ee9d1d2c..4e8134627 100644 --- a/lib/puppet/provider/nameservice/pw.rb +++ b/lib/puppet/provider/nameservice/pw.rb @@ -19,4 +19,3 @@ class PW < ObjectAdd end end -# $Id$ diff --git a/lib/puppet/provider/package.rb b/lib/puppet/provider/package.rb index 24293e235..094bfb9f4 100644 --- a/lib/puppet/provider/package.rb +++ b/lib/puppet/provider/package.rb @@ -28,4 +28,3 @@ class Puppet::Provider::Package < Puppet::Provider end end -# $Id$ diff --git a/lib/puppet/provider/package/appdmg.rb b/lib/puppet/provider/package/appdmg.rb index 1041e55d4..e822be14c 100644 --- a/lib/puppet/provider/package/appdmg.rb +++ b/lib/puppet/provider/package/appdmg.rb @@ -114,4 +114,3 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag end end -# $Id$ diff --git a/lib/puppet/provider/package/apple.rb b/lib/puppet/provider/package/apple.rb index 83606fc51..b211b7e12 100755 --- a/lib/puppet/provider/package/apple.rb +++ b/lib/puppet/provider/package/apple.rb @@ -52,4 +52,3 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package end end -# $Id$ diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb index b48d71625..016623d71 100755 --- a/lib/puppet/provider/package/apt.rb +++ b/lib/puppet/provider/package/apt.rb @@ -116,4 +116,3 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do end end -# $Id$ diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb index cad7449f4..699df0e51 100755 --- a/lib/puppet/provider/package/aptitude.rb +++ b/lib/puppet/provider/package/aptitude.rb @@ -29,4 +29,3 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg end end -# $Id$ diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb index 12dd7f378..9b3e7f015 100644 --- a/lib/puppet/provider/package/aptrpm.rb +++ b/lib/puppet/provider/package/aptrpm.rb @@ -84,4 +84,3 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do end end -# $Id$ diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb index e22fa1a69..402e8a1de 100755 --- a/lib/puppet/provider/package/blastwave.rb +++ b/lib/puppet/provider/package/blastwave.rb @@ -113,4 +113,3 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun end end -# $Id$ diff --git a/lib/puppet/provider/package/darwinport.rb b/lib/puppet/provider/package/darwinport.rb index 1f317d31c..73d5f395d 100755 --- a/lib/puppet/provider/package/darwinport.rb +++ b/lib/puppet/provider/package/darwinport.rb @@ -86,4 +86,3 @@ Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Pa end end -# $Id$ diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb index d2f7048b9..44e6a985c 100755 --- a/lib/puppet/provider/package/dpkg.rb +++ b/lib/puppet/provider/package/dpkg.rb @@ -122,4 +122,3 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package end end -# $Id$ diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb index 4bc857458..e0933df08 100755 --- a/lib/puppet/provider/package/fink.rb +++ b/lib/puppet/provider/package/fink.rb @@ -84,4 +84,3 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do end end -# $Id$ diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb index 7e94bb795..f98f3064e 100755 --- a/lib/puppet/provider/package/freebsd.rb +++ b/lib/puppet/provider/package/freebsd.rb @@ -39,4 +39,3 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do end end -# $Id$ diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb index f160adeb7..6e777a735 100755 --- a/lib/puppet/provider/package/gem.rb +++ b/lib/puppet/provider/package/gem.rb @@ -101,4 +101,3 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d end end -# $Id$ diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb index 11662abe8..093e509e5 100755 --- a/lib/puppet/provider/package/openbsd.rb +++ b/lib/puppet/provider/package/openbsd.rb @@ -85,4 +85,3 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa end end -# $Id$ diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index c068129ca..aa6de3245 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -190,4 +190,3 @@ package { Thunderbird-2.0.0.4-1.pkg.dmg: end end -# $Id$ diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb index bcfcfde2e..866ec8730 100644 --- a/lib/puppet/provider/package/portage.rb +++ b/lib/puppet/provider/package/portage.rb @@ -115,4 +115,3 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa end end -# $Id$ diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb index c17e47674..17a2755b4 100755 --- a/lib/puppet/provider/package/ports.rb +++ b/lib/puppet/provider/package/ports.rb @@ -93,4 +93,3 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre end end -# $Id$ diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb index 6e0ba5070..4af299283 100755 --- a/lib/puppet/provider/package/rpm.rb +++ b/lib/puppet/provider/package/rpm.rb @@ -114,4 +114,3 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr end end -# $Id$ diff --git a/lib/puppet/provider/package/sun.rb b/lib/puppet/provider/package/sun.rb index 92a5d0ef0..e204e6d58 100755 --- a/lib/puppet/provider/package/sun.rb +++ b/lib/puppet/provider/package/sun.rb @@ -167,4 +167,3 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d end end -# $Id$ diff --git a/lib/puppet/provider/package/sunfreeware.rb b/lib/puppet/provider/package/sunfreeware.rb index 6c5e1d702..8b573fe2b 100755 --- a/lib/puppet/provider/package/sunfreeware.rb +++ b/lib/puppet/provider/package/sunfreeware.rb @@ -6,4 +6,3 @@ Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source commands :pkgget => "pkg-get" end -# $Id$ diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb index 24cdfab21..dde633db4 100644 --- a/lib/puppet/provider/package/up2date.rb +++ b/lib/puppet/provider/package/up2date.rb @@ -38,4 +38,3 @@ Puppet.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do end end -# $Id$ diff --git a/lib/puppet/provider/package/urpmi.rb b/lib/puppet/provider/package/urpmi.rb index f19c6f41f..8adc62ab4 100644 --- a/lib/puppet/provider/package/urpmi.rb +++ b/lib/puppet/provider/package/urpmi.rb @@ -58,4 +58,3 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do end end -# $Id$ diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb index a9427061c..7998b92c0 100755 --- a/lib/puppet/provider/package/yum.rb +++ b/lib/puppet/provider/package/yum.rb @@ -95,4 +95,3 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do end end -# $Id$ diff --git a/lib/puppet/provider/parsedfile.rb b/lib/puppet/provider/parsedfile.rb index 338694fff..376cf04e3 100755 --- a/lib/puppet/provider/parsedfile.rb +++ b/lib/puppet/provider/parsedfile.rb @@ -362,4 +362,3 @@ class Puppet::Provider::ParsedFile < Puppet::Provider end end -# $Id$ diff --git a/lib/puppet/provider/port/parsed.rb b/lib/puppet/provider/port/parsed.rb index f5f12d3a1..68be0aa7c 100755 --- a/lib/puppet/provider/port/parsed.rb +++ b/lib/puppet/provider/port/parsed.rb @@ -171,4 +171,3 @@ require 'puppet/provider/parsedfile' # end #end -# $Id$ diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb index 971375126..43e78e6e8 100755 --- a/lib/puppet/provider/service/base.rb +++ b/lib/puppet/provider/service/base.rb @@ -131,4 +131,3 @@ Puppet::Type.type(:service).provide :base do end end -# $Id$ diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb index f7c5f3ced..d810eac1b 100755 --- a/lib/puppet/provider/service/debian.rb +++ b/lib/puppet/provider/service/debian.rb @@ -29,4 +29,3 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do end end -# $Id$ diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb index 51a77a157..c3328f517 100755 --- a/lib/puppet/provider/service/init.rb +++ b/lib/puppet/provider/service/init.rb @@ -146,4 +146,3 @@ Puppet::Type.type(:service).provide :init, :parent => :base do end end -# $Id$ diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb index feba05eef..41a060ee4 100755 --- a/lib/puppet/provider/service/redhat.rb +++ b/lib/puppet/provider/service/redhat.rb @@ -56,4 +56,3 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do end end -# $Id$ diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb index f25f65cd1..c74ce3f8f 100755 --- a/lib/puppet/provider/service/smf.rb +++ b/lib/puppet/provider/service/smf.rb @@ -82,4 +82,3 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do end end -# $Id$ diff --git a/lib/puppet/provider/sshkey/parsed.rb b/lib/puppet/provider/sshkey/parsed.rb index d6e175cf8..cb1010c5b 100755 --- a/lib/puppet/provider/sshkey/parsed.rb +++ b/lib/puppet/provider/sshkey/parsed.rb @@ -33,4 +33,3 @@ Puppet::Type.type(:sshkey).provide(:parsed, } end -# $Id$ diff --git a/lib/puppet/provider/user/netinfo.rb b/lib/puppet/provider/user/netinfo.rb index 35c1c6cd9..fccc6c294 100644 --- a/lib/puppet/provider/user/netinfo.rb +++ b/lib/puppet/provider/user/netinfo.rb @@ -103,4 +103,3 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ end end -# $Id$ diff --git a/lib/puppet/provider/user/pw.rb b/lib/puppet/provider/user/pw.rb index 1921a7e78..a2fb52fa8 100644 --- a/lib/puppet/provider/user/pw.rb +++ b/lib/puppet/provider/user/pw.rb @@ -43,4 +43,3 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService:: end end -# $Id$ diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb index dd05952f5..c2476203a 100644 --- a/lib/puppet/provider/user/useradd.rb +++ b/lib/puppet/provider/user/useradd.rb @@ -59,4 +59,3 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ end end -# $Id$ diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb index 5c89b86d9..dd8698b92 100644 --- a/lib/puppet/provider/zone/solaris.rb +++ b/lib/puppet/provider/zone/solaris.rb @@ -240,4 +240,3 @@ set zonepath=%s end end -# $Id$ diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 53dafce79..e9be5a547 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -124,4 +124,3 @@ if Puppet.features.rails? require 'puppet/rails/host' end -# $Id$ diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb index c3f525679..5365ce2a4 100644 --- a/lib/puppet/rails/database/schema.rb +++ b/lib/puppet/rails/database/schema.rb @@ -107,4 +107,3 @@ class Puppet::Rails::Schema end end -# $Id$ diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb index b7ca4c2e4..e0a26bdd4 100644 --- a/lib/puppet/rails/host.rb +++ b/lib/puppet/rails/host.rb @@ -154,4 +154,3 @@ class Puppet::Rails::Host < ActiveRecord::Base end end -# $Id$ diff --git a/lib/puppet/rails/param_name.rb b/lib/puppet/rails/param_name.rb index 95669264c..55d3727f9 100644 --- a/lib/puppet/rails/param_name.rb +++ b/lib/puppet/rails/param_name.rb @@ -19,4 +19,3 @@ class Puppet::Rails::ParamName < ActiveRecord::Base end end -# $Id$ diff --git a/lib/puppet/rails/param_value.rb b/lib/puppet/rails/param_value.rb index a176413eb..02c29c540 100644 --- a/lib/puppet/rails/param_value.rb +++ b/lib/puppet/rails/param_value.rb @@ -22,4 +22,3 @@ class Puppet::Rails::ParamValue < ActiveRecord::Base end end -# $Id$ diff --git a/lib/puppet/rails/puppet_class.rb b/lib/puppet/rails/puppet_class.rb index 1e8784ddb..35cef8974 100644 --- a/lib/puppet/rails/puppet_class.rb +++ b/lib/puppet/rails/puppet_class.rb @@ -4,4 +4,3 @@ class Puppet::Rails::PuppetClass < ActiveRecord::Base has_many :hosts end -# $Id$ diff --git a/lib/puppet/relationship.rb b/lib/puppet/relationship.rb index c848340d7..0b958fa39 100644 --- a/lib/puppet/relationship.rb +++ b/lib/puppet/relationship.rb @@ -60,4 +60,3 @@ class Puppet::Relationship < GRATR::Edge end end -# $Id$ diff --git a/lib/puppet/reports/log.rb b/lib/puppet/reports/log.rb index 96f14767b..8f7b95f8b 100644 --- a/lib/puppet/reports/log.rb +++ b/lib/puppet/reports/log.rb @@ -11,4 +11,3 @@ Puppet::Network::Handler.report.newreport(:log) do end end -# $Id$ diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb index 1516d331a..9ab1f4b17 100644 --- a/lib/puppet/reports/rrdgraph.rb +++ b/lib/puppet/reports/rrdgraph.rb @@ -135,4 +135,3 @@ Puppet::Network::Handler.report.newreport(:rrdgraph) do end end -# $Id$ diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb index 389de4e6e..0c3e86f37 100644 --- a/lib/puppet/reports/store.rb +++ b/lib/puppet/reports/store.rb @@ -61,4 +61,3 @@ Puppet::Network::Handler.report.newreport(:store, :useyaml => true) do end end -# $Id$ diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb index 8c65524ee..fd9126a1a 100644 --- a/lib/puppet/reports/tagmail.rb +++ b/lib/puppet/reports/tagmail.rb @@ -167,4 +167,3 @@ Puppet::Network::Handler.report.newreport(:tagmail) do end end -# $Id$ diff --git a/lib/puppet/sslcertificates.rb b/lib/puppet/sslcertificates.rb index 357959d0b..45b9e7a72 100755 --- a/lib/puppet/sslcertificates.rb +++ b/lib/puppet/sslcertificates.rb @@ -142,4 +142,3 @@ module Puppet::SSLCertificates require 'puppet/sslcertificates/ca' end -# $Id$ diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index fd416dd5e..39facdd48 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -414,4 +414,3 @@ class Puppet::SSLCertificates::CA end end -# $Id$ diff --git a/lib/puppet/sslcertificates/certificate.rb b/lib/puppet/sslcertificates/certificate.rb index e56bfa266..a632cbd6c 100644 --- a/lib/puppet/sslcertificates/certificate.rb +++ b/lib/puppet/sslcertificates/certificate.rb @@ -280,4 +280,3 @@ class Puppet::SSLCertificates::Certificate end end -# $Id$ diff --git a/lib/puppet/sslcertificates/inventory.rb b/lib/puppet/sslcertificates/inventory.rb index 14d2155a8..da959aa3b 100644 --- a/lib/puppet/sslcertificates/inventory.rb +++ b/lib/puppet/sslcertificates/inventory.rb @@ -37,4 +37,3 @@ module Puppet::SSLCertificates end end -# $Id$ diff --git a/lib/puppet/sslcertificates/support.rb b/lib/puppet/sslcertificates/support.rb index c8d2e846b..e63458b33 100644 --- a/lib/puppet/sslcertificates/support.rb +++ b/lib/puppet/sslcertificates/support.rb @@ -125,4 +125,3 @@ module Puppet::SSLCertificates::Support end end -# $Id$ diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index 4e2ab702f..e00a57f40 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -730,4 +730,3 @@ end require 'puppet/transaction/report' -# $Id$ diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb index 095b6c810..19dd1b629 100644 --- a/lib/puppet/transaction/report.rb +++ b/lib/puppet/transaction/report.rb @@ -76,4 +76,3 @@ class Puppet::Transaction::Report end end -# $Id$ diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 19f676ff4..0a6ccdaa4 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -415,4 +415,3 @@ require 'puppet/type/tidy' -# $Id$ diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb index bc1de4353..3154098db 100755 --- a/lib/puppet/type/cron.rb +++ b/lib/puppet/type/cron.rb @@ -408,5 +408,4 @@ Puppet::Type.newtype(:cron) do end -# $Id$ diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb index 5e281978a..42c3516d4 100755 --- a/lib/puppet/type/exec.rb +++ b/lib/puppet/type/exec.rb @@ -602,4 +602,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/group.rb b/lib/puppet/type/group.rb index e0291136a..36a4d49fa 100755 --- a/lib/puppet/type/group.rb +++ b/lib/puppet/type/group.rb @@ -129,4 +129,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/host.rb b/lib/puppet/type/host.rb index 6a2e9082d..be5c2ed72 100755 --- a/lib/puppet/type/host.rb +++ b/lib/puppet/type/host.rb @@ -86,4 +86,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/interface.rb b/lib/puppet/type/interface.rb index e0ad34761..1ddf68641 100644 --- a/lib/puppet/type/interface.rb +++ b/lib/puppet/type/interface.rb @@ -54,4 +54,3 @@ Puppet::Type.newtype(:interface) do end end -# $Id$ diff --git a/lib/puppet/type/mailalias.rb b/lib/puppet/type/mailalias.rb index 79dfe42cc..92f609267 100755 --- a/lib/puppet/type/mailalias.rb +++ b/lib/puppet/type/mailalias.rb @@ -47,4 +47,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/maillist.rb b/lib/puppet/type/maillist.rb index fd536b51e..7273488ee 100755 --- a/lib/puppet/type/maillist.rb +++ b/lib/puppet/type/maillist.rb @@ -54,4 +54,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb index 2a393391d..0ad879e4f 100755 --- a/lib/puppet/type/mount.rb +++ b/lib/puppet/type/mount.rb @@ -213,4 +213,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb index 743755108..548cf760c 100644 --- a/lib/puppet/type/notify.rb +++ b/lib/puppet/type/notify.rb @@ -43,4 +43,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb index ed4caee2d..e04f651a9 100644 --- a/lib/puppet/type/package.rb +++ b/lib/puppet/type/package.rb @@ -403,4 +403,3 @@ module Puppet end # Puppet.type(:package) end -# $Id$ diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index 5bf9fef78..1507c1725 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -1176,4 +1176,3 @@ module Puppet require 'puppet/type/pfile/mode' require 'puppet/type/pfile/type' end -# $Id$ diff --git a/lib/puppet/type/pfile/checksum.rb b/lib/puppet/type/pfile/checksum.rb index b5e6ab940..08f48ea21 100755 --- a/lib/puppet/type/pfile/checksum.rb +++ b/lib/puppet/type/pfile/checksum.rb @@ -324,4 +324,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfile/ensure.rb b/lib/puppet/type/pfile/ensure.rb index 42c472117..0a6f73d95 100755 --- a/lib/puppet/type/pfile/ensure.rb +++ b/lib/puppet/type/pfile/ensure.rb @@ -172,4 +172,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfile/group.rb b/lib/puppet/type/pfile/group.rb index b43b3c29d..9625b6354 100755 --- a/lib/puppet/type/pfile/group.rb +++ b/lib/puppet/type/pfile/group.rb @@ -118,4 +118,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfile/mode.rb b/lib/puppet/type/pfile/mode.rb index 08dee9903..8674e0a88 100755 --- a/lib/puppet/type/pfile/mode.rb +++ b/lib/puppet/type/pfile/mode.rb @@ -132,4 +132,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfile/owner.rb b/lib/puppet/type/pfile/owner.rb index 96325a0e0..d3fedd44e 100755 --- a/lib/puppet/type/pfile/owner.rb +++ b/lib/puppet/type/pfile/owner.rb @@ -167,4 +167,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfile/target.rb b/lib/puppet/type/pfile/target.rb index be3481528..b4a6481e0 100644 --- a/lib/puppet/type/pfile/target.rb +++ b/lib/puppet/type/pfile/target.rb @@ -72,4 +72,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfile/type.rb b/lib/puppet/type/pfile/type.rb index b0ceb4b23..65539795b 100755 --- a/lib/puppet/type/pfile/type.rb +++ b/lib/puppet/type/pfile/type.rb @@ -24,4 +24,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/pfilebucket.rb b/lib/puppet/type/pfilebucket.rb index df30c1872..cf4e5aac3 100755 --- a/lib/puppet/type/pfilebucket.rb +++ b/lib/puppet/type/pfilebucket.rb @@ -115,4 +115,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/port.rb b/lib/puppet/type/port.rb index dc2220070..db72b2331 100755 --- a/lib/puppet/type/port.rb +++ b/lib/puppet/type/port.rb @@ -116,4 +116,3 @@ # end #end -# $Id$ diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb index 549026b07..c0d892bb8 100644 --- a/lib/puppet/type/resources.rb +++ b/lib/puppet/type/resources.rb @@ -149,4 +149,3 @@ Puppet::Type.newtype(:resources) do end end -# $Id$ diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb index 4b39f7b07..46cff10f5 100755 --- a/lib/puppet/type/schedule.rb +++ b/lib/puppet/type/schedule.rb @@ -358,4 +358,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb index 9d94cc8a0..24237de35 100644 --- a/lib/puppet/type/service.rb +++ b/lib/puppet/type/service.rb @@ -312,4 +312,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/sshkey.rb b/lib/puppet/type/sshkey.rb index b047ff1cd..bf4b0aac8 100755 --- a/lib/puppet/type/sshkey.rb +++ b/lib/puppet/type/sshkey.rb @@ -72,4 +72,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb index 8b3ea6a76..f235d2e55 100755 --- a/lib/puppet/type/tidy.rb +++ b/lib/puppet/type/tidy.rb @@ -292,4 +292,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb index 80b1ddf02..48e35f2c8 100755 --- a/lib/puppet/type/user.rb +++ b/lib/puppet/type/user.rb @@ -343,4 +343,3 @@ module Puppet end end -# $Id$ diff --git a/lib/puppet/type/zone.rb b/lib/puppet/type/zone.rb index 54220a0fc..4fd92672c 100644 --- a/lib/puppet/type/zone.rb +++ b/lib/puppet/type/zone.rb @@ -400,4 +400,3 @@ end end end -# $Id$ diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index 5a10f5344..2e83a08e9 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -461,4 +461,3 @@ require 'puppet/util/logging' require 'puppet/util/package' require 'puppet/util/warnings' -# $Id$ 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/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$ diff --git a/spec/unit/other/transobject.rb b/spec/unit/other/transobject.rb index 07c9dc761..144940b7e 100755 --- a/spec/unit/other/transobject.rb +++ b/spec/unit/other/transobject.rb @@ -113,4 +113,3 @@ class TestTransportable < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/ca.rb b/test/certmgr/ca.rb index f464f4501..543d3dd25 100755 --- a/test/certmgr/ca.rb +++ b/test/certmgr/ca.rb @@ -85,4 +85,3 @@ class TestCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb index 3d863dc27..a0cc3abc9 100755 --- a/test/certmgr/certmgr.rb +++ b/test/certmgr/certmgr.rb @@ -297,4 +297,3 @@ class TestCertMgr < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/inventory.rb b/test/certmgr/inventory.rb index 9efcb0c09..55b9cec6d 100755 --- a/test/certmgr/inventory.rb +++ b/test/certmgr/inventory.rb @@ -65,4 +65,3 @@ class TestCertInventory < Test::Unit::TestCase end end -# $Id$ diff --git a/test/certmgr/support.rb b/test/certmgr/support.rb index e6080a237..b0b79a62f 100755 --- a/test/certmgr/support.rb +++ b/test/certmgr/support.rb @@ -80,4 +80,3 @@ class TestCertSupport < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/filebucket.rb b/test/executables/filebucket.rb index 421eeb1fd..82746bde9 100755 --- a/test/executables/filebucket.rb +++ b/test/executables/filebucket.rb @@ -46,4 +46,3 @@ class TestFileBucketExe < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb index b58718112..e498a85d2 100755 --- a/test/executables/puppetbin.rb +++ b/test/executables/puppetbin.rb @@ -85,4 +85,3 @@ class TestPuppetBin < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb index 82e90df72..e1c516d98 100755 --- a/test/executables/puppetca.rb +++ b/test/executables/puppetca.rb @@ -113,4 +113,3 @@ class TestPuppetCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index 220ff4283..ea63d70f2 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.rb @@ -56,4 +56,3 @@ class TestPuppetDExe < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index 5195fa345..58726db45 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.rb @@ -140,4 +140,3 @@ class TestPuppetMasterD < Test::Unit::TestCase end end -# $Id$ diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb index 58ce11978..9e04bc2e8 100755 --- a/test/executables/puppetmodule.rb +++ b/test/executables/puppetmodule.rb @@ -53,4 +53,3 @@ class TestPuppetModule < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/ast/casestatement.rb b/test/language/ast/casestatement.rb index 036216757..4623a2235 100755 --- a/test/language/ast/casestatement.rb +++ b/test/language/ast/casestatement.rb @@ -101,4 +101,3 @@ class TestCaseStatement < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb index c7dfeb2fe..7394f5f7d 100755 --- a/test/language/ast/selector.rb +++ b/test/language/ast/selector.rb @@ -59,4 +59,3 @@ class TestSelector < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb index 42c33d80d..bf22021d0 100755 --- a/test/language/ast/variable.rb +++ b/test/language/ast/variable.rb @@ -28,4 +28,3 @@ class TestVariable < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/functions.rb b/test/language/functions.rb index be06d8eac..2a392e01a 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -536,4 +536,3 @@ class TestLangFunctions < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/lexer.rb b/test/language/lexer.rb index c2dd17324..38a7ddb22 100755 --- a/test/language/lexer.rb +++ b/test/language/lexer.rb @@ -274,4 +274,3 @@ class TestLexer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/language/parser.rb b/test/language/parser.rb index 6f7599f27..9109686cb 100755 --- a/test/language/parser.rb +++ b/test/language/parser.rb @@ -1202,4 +1202,3 @@ file { "/tmp/yayness": end end -# $Id$ diff --git a/test/language/scope.rb b/test/language/scope.rb index 74f47b136..b4db5ef40 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -515,4 +515,3 @@ Host <<||>>" end end -# $Id$ diff --git a/test/language/transportable.rb b/test/language/transportable.rb index 3ef82983c..31931c937 100755 --- a/test/language/transportable.rb +++ b/test/language/transportable.rb @@ -104,4 +104,3 @@ class TestTransportable < Test::Unit::TestCase end end -# $Id$ diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 021d6d1de..d1e690e70 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -312,4 +312,3 @@ require 'puppettest/parsertesting' require 'puppettest/servertest' require 'puppettest/testcase' -# $Id$ diff --git a/test/lib/puppettest/certificates.rb b/test/lib/puppettest/certificates.rb index ff19b95b3..fbd18e997 100644 --- a/test/lib/puppettest/certificates.rb +++ b/test/lib/puppettest/certificates.rb @@ -58,4 +58,3 @@ module PuppetTest::Certificates end end -# $Id$ diff --git a/test/lib/puppettest/exetest.rb b/test/lib/puppettest/exetest.rb index 8d91b88cc..be148a169 100644 --- a/test/lib/puppettest/exetest.rb +++ b/test/lib/puppettest/exetest.rb @@ -127,4 +127,3 @@ module PuppetTest::ExeTest end end -# $Id$ diff --git a/test/lib/puppettest/fakes.rb b/test/lib/puppettest/fakes.rb index df1c3732e..739b098bc 100644 --- a/test/lib/puppettest/fakes.rb +++ b/test/lib/puppettest/fakes.rb @@ -202,4 +202,3 @@ module PuppetTest module_function :fakeprovider end -# $Id$ diff --git a/test/lib/puppettest/fileparsing.rb b/test/lib/puppettest/fileparsing.rb index ba4f5ad9c..9f7716ab2 100644 --- a/test/lib/puppettest/fileparsing.rb +++ b/test/lib/puppettest/fileparsing.rb @@ -30,4 +30,3 @@ module PuppetTest::FileParsing end end -# $Id$ diff --git a/test/lib/puppettest/filetesting.rb b/test/lib/puppettest/filetesting.rb index 43a2ae1a0..1aa1cf703 100644 --- a/test/lib/puppettest/filetesting.rb +++ b/test/lib/puppettest/filetesting.rb @@ -228,4 +228,3 @@ module PuppetTest::FileTesting end end -# $Id$ diff --git a/test/lib/puppettest/railstesting.rb b/test/lib/puppettest/railstesting.rb index 403bdb756..a9d8601f3 100644 --- a/test/lib/puppettest/railstesting.rb +++ b/test/lib/puppettest/railstesting.rb @@ -51,4 +51,3 @@ module PuppetTest::RailsTesting end end -# $Id$ diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb index 67d715d4a..9b1764cf6 100644 --- a/test/lib/puppettest/reporttesting.rb +++ b/test/lib/puppettest/reporttesting.rb @@ -16,4 +16,3 @@ module PuppetTest::Reporttesting end end -# $Id$ diff --git a/test/lib/puppettest/resourcetesting.rb b/test/lib/puppettest/resourcetesting.rb index 325602c22..d4469a203 100644 --- a/test/lib/puppettest/resourcetesting.rb +++ b/test/lib/puppettest/resourcetesting.rb @@ -43,4 +43,3 @@ module PuppetTest::ResourceTesting end end -# $Id$ diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb index 018715a54..3d1381111 100644 --- a/test/lib/puppettest/servertest.rb +++ b/test/lib/puppettest/servertest.rb @@ -69,4 +69,3 @@ module PuppetTest::ServerTest end -# $Id$ diff --git a/test/lib/puppettest/support/collection.rb b/test/lib/puppettest/support/collection.rb index 305b805d5..43df03048 100644 --- a/test/lib/puppettest/support/collection.rb +++ b/test/lib/puppettest/support/collection.rb @@ -27,4 +27,3 @@ module PuppetTest::Support::Collection end end -# $Id$ diff --git a/test/lib/puppettest/support/helpers.rb b/test/lib/puppettest/support/helpers.rb index dc01fa3b8..5b1872dfb 100644 --- a/test/lib/puppettest/support/helpers.rb +++ b/test/lib/puppettest/support/helpers.rb @@ -20,4 +20,3 @@ module PuppetTest end end -# $Id$ diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb index b5189202f..ee29a8875 100644 --- a/test/lib/puppettest/support/utils.rb +++ b/test/lib/puppettest/support/utils.rb @@ -171,4 +171,3 @@ module PuppetTest end end -# $Id$ diff --git a/test/lib/rake/puppet_test_loader.rb b/test/lib/rake/puppet_test_loader.rb index 23033fa5d..be3319ccc 100644 --- a/test/lib/rake/puppet_test_loader.rb +++ b/test/lib/rake/puppet_test_loader.rb @@ -14,4 +14,3 @@ unless runner.run exit 14 end -# $Id$ diff --git a/test/lib/rake/puppet_testtask.rb b/test/lib/rake/puppet_testtask.rb index a53f0753d..6e8e3642a 100644 --- a/test/lib/rake/puppet_testtask.rb +++ b/test/lib/rake/puppet_testtask.rb @@ -14,4 +14,3 @@ module Rake end end -# $Id$ diff --git a/test/network/authconfig.rb b/test/network/authconfig.rb index 2f99f0ede..e22431c75 100755 --- a/test/network/authconfig.rb +++ b/test/network/authconfig.rb @@ -68,5 +68,4 @@ class TestAuthConfig < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/authorization.rb b/test/network/authorization.rb index f0ce0af7f..766c454e0 100755 --- a/test/network/authorization.rb +++ b/test/network/authorization.rb @@ -134,5 +134,4 @@ class TestAuthConfig < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/authstore.rb b/test/network/authstore.rb index ae407c96e..6d2bc08e2 100755 --- a/test/network/authstore.rb +++ b/test/network/authstore.rb @@ -446,5 +446,4 @@ class TestAuthStoreDeclaration < PuppetTest::TestCase end end -# $Id$ diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb index 511b6fcaa..c996e1abd 100755 --- a/test/network/client/ca.rb +++ b/test/network/client/ca.rb @@ -62,4 +62,3 @@ class TestClientCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client/client.rb b/test/network/client/client.rb index 382cd55cf..484c794e4 100755 --- a/test/network/client/client.rb +++ b/test/network/client/client.rb @@ -256,4 +256,3 @@ class TestClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client/dipper.rb b/test/network/client/dipper.rb index e91dea2a7..d48b50478 100755 --- a/test/network/client/dipper.rb +++ b/test/network/client/dipper.rb @@ -32,4 +32,3 @@ class TestDipperClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client/resource.rb b/test/network/client/resource.rb index da066e5b2..2b034f079 100755 --- a/test/network/client/resource.rb +++ b/test/network/client/resource.rb @@ -80,4 +80,3 @@ class TestResourceClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/client_request.rb b/test/network/client_request.rb index 7c6e9b3c8..f7804ec07 100755 --- a/test/network/client_request.rb +++ b/test/network/client_request.rb @@ -35,5 +35,4 @@ class TestClientRequest < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/daemon.rb b/test/network/daemon.rb index 89f88ddce..e794ce241 100755 --- a/test/network/daemon.rb +++ b/test/network/daemon.rb @@ -67,5 +67,4 @@ class TestDaemon < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb index 65badc9eb..30a192f09 100755 --- a/test/network/handler/bucket.rb +++ b/test/network/handler/bucket.rb @@ -342,4 +342,3 @@ class TestBucket < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb index f503d7c7a..3e74f8e05 100755 --- a/test/network/handler/ca.rb +++ b/test/network/handler/ca.rb @@ -272,4 +272,3 @@ class TestCA < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index b81262947..8dcbf63ea 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -1150,5 +1150,4 @@ allow * end end -# $Id$ diff --git a/test/network/handler/handler.rb b/test/network/handler/handler.rb index df49ee580..b812ca3d3 100755 --- a/test/network/handler/handler.rb +++ b/test/network/handler/handler.rb @@ -61,4 +61,3 @@ class TestHandler < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index 4f8e7fab2..42c4d22c9 100755 --- a/test/network/handler/master.rb +++ b/test/network/handler/master.rb @@ -158,5 +158,4 @@ class TestMaster < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/report.rb b/test/network/handler/report.rb index 17cf21c7a..ac8cf6fac 100755 --- a/test/network/handler/report.rb +++ b/test/network/handler/report.rb @@ -181,5 +181,4 @@ class TestReportServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/resource.rb b/test/network/handler/resource.rb index 18f52dbd6..b2acc00b9 100755 --- a/test/network/handler/resource.rb +++ b/test/network/handler/resource.rb @@ -291,4 +291,3 @@ class TestResourceServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/handler/runner.rb b/test/network/handler/runner.rb index b6df9bab9..23883a17c 100755 --- a/test/network/handler/runner.rb +++ b/test/network/handler/runner.rb @@ -104,5 +104,4 @@ class TestHandlerRunner < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/rights.rb b/test/network/rights.rb index edbcaac80..a3e780330 100755 --- a/test/network/rights.rb +++ b/test/network/rights.rb @@ -34,5 +34,4 @@ class TestRights < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb index b7a383872..05d18257b 100755 --- a/test/network/server/mongrel_test.rb +++ b/test/network/server/mongrel_test.rb @@ -89,4 +89,3 @@ class TestMongrelServer < PuppetTest::TestCase end end -# $Id$ diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index a9448fe6c..0f76659b1 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -144,4 +144,3 @@ class TestWebrickServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/client.rb b/test/network/xmlrpc/client.rb index f3c6d2388..a81e95a86 100755 --- a/test/network/xmlrpc/client.rb +++ b/test/network/xmlrpc/client.rb @@ -71,5 +71,4 @@ class TestXMLRPCClient < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb index 6808d0100..bc29f4c23 100755 --- a/test/network/xmlrpc/processor.rb +++ b/test/network/xmlrpc/processor.rb @@ -77,5 +77,4 @@ class TestXMLRPCProcessor < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/server.rb b/test/network/xmlrpc/server.rb index 65e5f1126..ff9f72e0c 100755 --- a/test/network/xmlrpc/server.rb +++ b/test/network/xmlrpc/server.rb @@ -24,5 +24,4 @@ class TestXMLRPCServer < Test::Unit::TestCase end end -# $Id$ diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb index e7a6af171..154cc6cf9 100755 --- a/test/network/xmlrpc/webrick_servlet.rb +++ b/test/network/xmlrpc/webrick_servlet.rb @@ -29,5 +29,4 @@ class TestXMLRPCWEBrickServlet < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/events.rb b/test/other/events.rb index b67ea05a1..30b045695 100755 --- a/test/other/events.rb +++ b/test/other/events.rb @@ -5,7 +5,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' -# $Id$ class TestEvents < Test::Unit::TestCase include PuppetTest diff --git a/test/other/overrides.rb b/test/other/overrides.rb index 9a7c4b8ba..bfdf174a4 100755 --- a/test/other/overrides.rb +++ b/test/other/overrides.rb @@ -105,4 +105,3 @@ class TestOverrides < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/propertychange.rb b/test/other/propertychange.rb index 6d5c91b34..34669771b 100755 --- a/test/other/propertychange.rb +++ b/test/other/propertychange.rb @@ -138,4 +138,3 @@ class TestPropertyChange < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/provider.rb b/test/other/provider.rb index 9a9b00a70..a39c4e1e9 100755 --- a/test/other/provider.rb +++ b/test/other/provider.rb @@ -159,4 +159,3 @@ class TestImpl < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/puppet.rb b/test/other/puppet.rb index b9bf16475..45039e3c6 100755 --- a/test/other/puppet.rb +++ b/test/other/puppet.rb @@ -129,4 +129,3 @@ class TestPuppetModule < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/relationship.rb b/test/other/relationship.rb index 0a4d725ae..60c240b7a 100755 --- a/test/other/relationship.rb +++ b/test/other/relationship.rb @@ -71,4 +71,3 @@ class TestRelationship < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/relationships.rb b/test/other/relationships.rb index 771b119ee..edf97373c 100755 --- a/test/other/relationships.rb +++ b/test/other/relationships.rb @@ -213,4 +213,3 @@ class TestRelationships < Test::Unit::TestCase end end -# $Id$ diff --git a/test/other/report.rb b/test/other/report.rb index 3de2dfbee..8f33a7166 100755 --- a/test/other/report.rb +++ b/test/other/report.rb @@ -243,4 +243,3 @@ class TestReports < Test::Unit::TestCase end end -# $Id$ diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb index 1800c80f6..06f563a08 100755 --- a/test/puppet/conffiles.rb +++ b/test/puppet/conffiles.rb @@ -105,4 +105,3 @@ class TestConfFiles < Test::Unit::TestCase end -# $Id$ diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 383153e45..3d7ee384a 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -5,7 +5,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ require 'puppet' require 'puppettest' -# $Id$ class TestPuppetDefaults < Test::Unit::TestCase include PuppetTest diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb index 27a09ae5a..fb06a30f0 100755 --- a/test/puppet/errortest.rb +++ b/test/puppet/errortest.rb @@ -17,4 +17,3 @@ class TestError < Test::Unit::TestCase end end -# $Id$ diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb index ba16b5ef8..905d3d0c9 100755 --- a/test/puppet/tc_suidmanager.rb +++ b/test/puppet/tc_suidmanager.rb @@ -101,4 +101,3 @@ class TestSUIDManager < Test::Unit::TestCase end end -# $Id$ diff --git a/test/rails/ast.rb b/test/rails/ast.rb index fb6374401..48ec18c45 100755 --- a/test/rails/ast.rb +++ b/test/rails/ast.rb @@ -71,4 +71,3 @@ class TestRailsAST < PuppetTest::TestCase end end -# $Id$ diff --git a/test/rails/collection.rb b/test/rails/collection.rb index 56f71e635..cbae9a1e4 100755 --- a/test/rails/collection.rb +++ b/test/rails/collection.rb @@ -238,4 +238,3 @@ class TestRailsCollection < PuppetTest::TestCase end end -# $Id$ diff --git a/test/rails/host.rb b/test/rails/host.rb index 5ac2f763e..4d9c64932 100755 --- a/test/rails/host.rb +++ b/test/rails/host.rb @@ -189,4 +189,3 @@ class TestRailsHost < PuppetTest::TestCase end end -# $Id$ diff --git a/test/rails/rails.rb b/test/rails/rails.rb index 2803e07a8..f6756ed24 100755 --- a/test/rails/rails.rb +++ b/test/rails/rails.rb @@ -24,4 +24,3 @@ class TestRails < Test::Unit::TestCase end end -# $Id$ diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb index 89c81ad30..c2a82929d 100755 --- a/test/rails/railsparameter.rb +++ b/test/rails/railsparameter.rb @@ -70,4 +70,3 @@ else $stderr.puts "Install Rails for Rails and Caching tests" end -# $Id$ diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb index ca582b8b0..7a1ffd217 100755 --- a/test/rails/railsresource.rb +++ b/test/rails/railsresource.rb @@ -247,5 +247,4 @@ class TestExportedResources < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb index ef8742d48..28cb07f69 100755 --- a/test/ral/manager/attributes.rb +++ b/test/ral/manager/attributes.rb @@ -349,4 +349,3 @@ class TestTypeAttributes < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/manager/instances.rb b/test/ral/manager/instances.rb index e7a43488a..14b85f95d 100755 --- a/test/ral/manager/instances.rb +++ b/test/ral/manager/instances.rb @@ -106,4 +106,3 @@ class TestTypeInstances < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb index 8a273ecfd..4f2ade4e9 100755 --- a/test/ral/manager/manager.rb +++ b/test/ral/manager/manager.rb @@ -52,4 +52,3 @@ class TestTypeManager < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/manager/provider.rb b/test/ral/manager/provider.rb index 1fcb5efbc..0aeac357f 100755 --- a/test/ral/manager/provider.rb +++ b/test/ral/manager/provider.rb @@ -89,4 +89,3 @@ class TestTypeProviders < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb index 7df7bab3d..5e7fa3bd6 100755 --- a/test/ral/providers/cron/crontab.rb +++ b/test/ral/providers/cron/crontab.rb @@ -601,4 +601,3 @@ class TestCronParsedProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb index 158fc4afa..2d5122da0 100755 --- a/test/ral/providers/group.rb +++ b/test/ral/providers/group.rb @@ -249,4 +249,3 @@ class TestGroupProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb index 674253d3c..f49a00beb 100755 --- a/test/ral/providers/host/netinfo.rb +++ b/test/ral/providers/host/netinfo.rb @@ -54,4 +54,3 @@ end end end -# $Id$ diff --git a/test/ral/providers/host/parsed.rb b/test/ral/providers/host/parsed.rb index 85f5cb664..5499b0220 100755 --- a/test/ral/providers/host/parsed.rb +++ b/test/ral/providers/host/parsed.rb @@ -223,4 +223,3 @@ class TestParsedHostProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb index d0a95d877..e54b6659a 100755 --- a/test/ral/providers/mailalias/aliases.rb +++ b/test/ral/providers/mailalias/aliases.rb @@ -54,4 +54,3 @@ class TestMailaliasAliasesProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb index af65e5a4d..dc4316b8a 100755 --- a/test/ral/providers/mount/netinfo.rb +++ b/test/ral/providers/mount/netinfo.rb @@ -77,4 +77,3 @@ require 'puppettest' # end # end -# $Id$ diff --git a/test/ral/providers/mount/parsed.rb b/test/ral/providers/mount/parsed.rb index 9637a840f..4fe644734 100755 --- a/test/ral/providers/mount/parsed.rb +++ b/test/ral/providers/mount/parsed.rb @@ -248,4 +248,3 @@ class TestParsedMountsNonDarwinAsRoot < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/providers/nameservice.rb b/test/ral/providers/nameservice.rb index f63853af3..f15e51d02 100755 --- a/test/ral/providers/nameservice.rb +++ b/test/ral/providers/nameservice.rb @@ -30,4 +30,3 @@ class TestNameServiceProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb index 969bd39a1..a0283b363 100755 --- a/test/ral/providers/package.rb +++ b/test/ral/providers/package.rb @@ -275,4 +275,3 @@ class TestPackageProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/package/apt.rb b/test/ral/providers/package/apt.rb index a82f1bc3a..f4fb1a95c 100755 --- a/test/ral/providers/package/apt.rb +++ b/test/ral/providers/package/apt.rb @@ -167,4 +167,3 @@ class AptPackageProviderTest < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb index a3257bcce..c005ee5a6 100755 --- a/test/ral/providers/package/aptrpm.rb +++ b/test/ral/providers/package/aptrpm.rb @@ -86,4 +86,3 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb index 053a1993d..8a5982553 100755 --- a/test/ral/providers/parsedfile.rb +++ b/test/ral/providers/parsedfile.rb @@ -695,5 +695,4 @@ class TestParsedFile < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/port/parsed.rb b/test/ral/providers/port/parsed.rb index acd6eda1f..b8237ad86 100755 --- a/test/ral/providers/port/parsed.rb +++ b/test/ral/providers/port/parsed.rb @@ -230,4 +230,3 @@ require 'puppettest' # end #end -# $Id$ diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb index 7fcf3f59d..ee7eb1bca 100755 --- a/test/ral/providers/provider.rb +++ b/test/ral/providers/provider.rb @@ -500,4 +500,3 @@ class TestProviderFeatures < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/service.rb b/test/ral/providers/service.rb index 5a4a6c1c2..c4127146f 100755 --- a/test/ral/providers/service.rb +++ b/test/ral/providers/service.rb @@ -232,4 +232,3 @@ class TestLocalService < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb index 03e7105ca..7300b77af 100755 --- a/test/ral/providers/service/base.rb +++ b/test/ral/providers/service/base.rb @@ -72,4 +72,3 @@ class TestBaseServiceProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/sshkey/parsed.rb b/test/ral/providers/sshkey/parsed.rb index 4a8ce07f1..017bb983f 100755 --- a/test/ral/providers/sshkey/parsed.rb +++ b/test/ral/providers/sshkey/parsed.rb @@ -108,4 +108,3 @@ class TestParsedSSHKey < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb index 7e5290549..1c2fd2f1f 100755 --- a/test/ral/providers/user.rb +++ b/test/ral/providers/user.rb @@ -563,4 +563,3 @@ class TestUserProvider < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb index 55bb96f2a..28692be6c 100755 --- a/test/ral/providers/user/useradd.rb +++ b/test/ral/providers/user/useradd.rb @@ -243,4 +243,3 @@ class UserRootAddProviderTest < PuppetTest::TestCase end -# $Id$ diff --git a/test/ral/types/cron.rb b/test/ral/types/cron.rb index 1695befac..4a65d32d8 100755 --- a/test/ral/types/cron.rb +++ b/test/ral/types/cron.rb @@ -501,4 +501,3 @@ class TestCron < Test::Unit::TestCase end -# $Id$ diff --git a/test/ral/types/exec.rb b/test/ral/types/exec.rb index 0c7cc1d90..e7ffa0aec 100755 --- a/test/ral/types/exec.rb +++ b/test/ral/types/exec.rb @@ -728,4 +728,3 @@ and stuff" end end -# $Id$ diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb index 0c16d6dff..de8d60447 100755 --- a/test/ral/types/file.rb +++ b/test/ral/types/file.rb @@ -1813,4 +1813,3 @@ class TestFile < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/file/target.rb b/test/ral/types/file/target.rb index c4597cedf..8dda94e92 100755 --- a/test/ral/types/file/target.rb +++ b/test/ral/types/file/target.rb @@ -360,4 +360,3 @@ class TestFileTarget < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/filebucket.rb b/test/ral/types/filebucket.rb index 5b0093425..094a5da2b 100755 --- a/test/ral/types/filebucket.rb +++ b/test/ral/types/filebucket.rb @@ -153,4 +153,3 @@ class TestFileBucket < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb index 01d9766db..5ef002fa4 100755 --- a/test/ral/types/filesources.rb +++ b/test/ral/types/filesources.rb @@ -1000,4 +1000,3 @@ class TestFileSources < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/host.rb b/test/ral/types/host.rb index 57d425e7c..8244caed0 100755 --- a/test/ral/types/host.rb +++ b/test/ral/types/host.rb @@ -159,4 +159,3 @@ class TestHost < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/interface.rb b/test/ral/types/interface.rb index 0e2768d9e..0de538721 100755 --- a/test/ral/types/interface.rb +++ b/test/ral/types/interface.rb @@ -37,4 +37,3 @@ class TestInterfaceType < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/types/mailalias.rb b/test/ral/types/mailalias.rb index 6dce531e9..544e6d2ae 100755 --- a/test/ral/types/mailalias.rb +++ b/test/ral/types/mailalias.rb @@ -47,4 +47,3 @@ class TestMailAlias < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/mount.rb b/test/ral/types/mount.rb index c4314db98..fa5022e3d 100755 --- a/test/ral/types/mount.rb +++ b/test/ral/types/mount.rb @@ -359,4 +359,3 @@ class TestMounts < PuppetTest::TestCase end end -# $Id$ diff --git a/test/ral/types/package.rb b/test/ral/types/package.rb index e97c6bd3c..d09cfdc8e 100755 --- a/test/ral/types/package.rb +++ b/test/ral/types/package.rb @@ -154,4 +154,3 @@ class TestPackages < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/parameter.rb b/test/ral/types/parameter.rb index bc79d0bd5..70c325e08 100755 --- a/test/ral/types/parameter.rb +++ b/test/ral/types/parameter.rb @@ -169,4 +169,3 @@ class TestParameter < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/port.rb b/test/ral/types/port.rb index 30292e1af..743107e44 100755 --- a/test/ral/types/port.rb +++ b/test/ral/types/port.rb @@ -145,4 +145,3 @@ require 'puppettest' # end #end -# $Id$ diff --git a/test/ral/types/property.rb b/test/ral/types/property.rb index 27998d6fd..2ad5212b7 100755 --- a/test/ral/types/property.rb +++ b/test/ral/types/property.rb @@ -385,4 +385,3 @@ class TestProperty < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/resources.rb b/test/ral/types/resources.rb index 82d4e225d..3ee785444 100755 --- a/test/ral/types/resources.rb +++ b/test/ral/types/resources.rb @@ -206,4 +206,3 @@ class TestResources < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/schedule.rb b/test/ral/types/schedule.rb index cc565bbfc..a07ac791e 100755 --- a/test/ral/types/schedule.rb +++ b/test/ral/types/schedule.rb @@ -354,4 +354,3 @@ class TestSchedule < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/service.rb b/test/ral/types/service.rb index 488cd7147..b187a08cd 100755 --- a/test/ral/types/service.rb +++ b/test/ral/types/service.rb @@ -36,4 +36,3 @@ class TestServiceType < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/sshkey.rb b/test/ral/types/sshkey.rb index 9a20dc251..26349e382 100755 --- a/test/ral/types/sshkey.rb +++ b/test/ral/types/sshkey.rb @@ -189,4 +189,3 @@ class TestSSHKey < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/tidy.rb b/test/ral/types/tidy.rb index 8fada1adb..521f1acc5 100755 --- a/test/ral/types/tidy.rb +++ b/test/ral/types/tidy.rb @@ -228,4 +228,3 @@ class TestTidy < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/user.rb b/test/ral/types/user.rb index 9b24cc74a..9a76c0585 100755 --- a/test/ral/types/user.rb +++ b/test/ral/types/user.rb @@ -490,4 +490,3 @@ class TestUser < Test::Unit::TestCase end end -# $Id$ diff --git a/test/ral/types/zone.rb b/test/ral/types/zone.rb index d68306201..eef791361 100755 --- a/test/ral/types/zone.rb +++ b/test/ral/types/zone.rb @@ -418,4 +418,3 @@ end end end -# $Id$ diff --git a/test/util/classgen.rb b/test/util/classgen.rb index 778bdbb4f..0ecb61f56 100755 --- a/test/util/classgen.rb +++ b/test/util/classgen.rb @@ -224,4 +224,3 @@ class TestPuppetUtilClassGen < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/execution.rb b/test/util/execution.rb index 0b3541775..ce748c75a 100755 --- a/test/util/execution.rb +++ b/test/util/execution.rb @@ -31,4 +31,3 @@ class TestPuppetUtilExecution < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb index 9a892c383..127dbe1d1 100755 --- a/test/util/fileparsing.rb +++ b/test/util/fileparsing.rb @@ -673,5 +673,4 @@ class TestUtilFileRecord < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/filetype.rb b/test/util/filetype.rb index 2c4a16fc2..e98fb5f6c 100755 --- a/test/util/filetype.rb +++ b/test/util/filetype.rb @@ -135,4 +135,3 @@ class TestFileType < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/instance_loader.rb b/test/util/instance_loader.rb index 24e8c9cab..be055fc5c 100755 --- a/test/util/instance_loader.rb +++ b/test/util/instance_loader.rb @@ -50,4 +50,3 @@ class TestInstanceloader < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/loadedfile.rb b/test/util/loadedfile.rb index f7f9f6e23..801ba5b2a 100755 --- a/test/util/loadedfile.rb +++ b/test/util/loadedfile.rb @@ -119,4 +119,3 @@ class TestLoadedFile < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/log.rb b/test/util/log.rb index 9ede9176a..0e5a542db 100755 --- a/test/util/log.rb +++ b/test/util/log.rb @@ -272,4 +272,3 @@ class TestLog < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/metrics.rb b/test/util/metrics.rb index fd997df17..2775b3ff1 100755 --- a/test/util/metrics.rb +++ b/test/util/metrics.rb @@ -75,4 +75,3 @@ class TestMetric < PuppetTest::TestCase end end -# $Id$ diff --git a/test/util/package.rb b/test/util/package.rb index 73b069f84..737d8e5b4 100755 --- a/test/util/package.rb +++ b/test/util/package.rb @@ -24,4 +24,3 @@ class TestPuppetUtilPackage < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb index 0dd437fa8..ae32c7a3f 100755 --- a/test/util/posixtest.rb +++ b/test/util/posixtest.rb @@ -167,4 +167,3 @@ class TestPosixUtil < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/settings.rb b/test/util/settings.rb index 62f34fda6..7dad04968 100755 --- a/test/util/settings.rb +++ b/test/util/settings.rb @@ -1104,4 +1104,3 @@ yay = /a/path end end -# $Id$ diff --git a/test/util/storage.rb b/test/util/storage.rb index dd68af5bf..d583e2c59 100755 --- a/test/util/storage.rb +++ b/test/util/storage.rb @@ -120,4 +120,3 @@ class TestStorage < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/subclass_loader.rb b/test/util/subclass_loader.rb index 5c8174cfa..2066785f7 100755 --- a/test/util/subclass_loader.rb +++ b/test/util/subclass_loader.rb @@ -97,4 +97,3 @@ class TestPuppetUtilSubclassLoader < Test::Unit::TestCase end end -# $Id$ diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb index 405ddbb48..13a17ed6c 100755 --- a/test/util/utiltest.rb +++ b/test/util/utiltest.rb @@ -285,4 +285,3 @@ class TestPuppetUtil < Test::Unit::TestCase end end -# $Id$ -- cgit From 938f051256f206e01039d2c5142b2328fc25e639 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 3 Oct 2007 23:52:36 -0500 Subject: Fixing #817, mostly using the patch by DavidS. I could not directly use the patch because I have refactored too much. --- lib/puppet/transaction.rb | 10 ++++++++++ lib/puppet/util/settings.rb | 25 +++++-------------------- spec/unit/util/settings.rb | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index e00a57f40..3c72f6e97 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -43,6 +43,16 @@ class Transaction return true end + # Are there any failed resources in this transaction? + def any_failed? + failures = @failures.inject(0) { |failures, array| failures += array[1]; failures } + if failures > 0 + failures + else + false + end + end + # Apply all changes for a resource, returning a list of the events # generated. def apply(resource) diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index ab55fbd2b..0bd288ec2 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -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/spec/unit/util/settings.rb b/spec/unit/util/settings.rb index 8d11737b3..e647ce1cd 100755 --- a/spec/unit/util/settings.rb +++ b/spec/unit/util/settings.rb @@ -395,6 +395,17 @@ describe Puppet::Util::Settings, " when being used to manage the host machine" d @settings.setdefaults :files, :myfile => {:default => "/myfile", :desc => "a", :mode => 0755} end + def stub_transaction + @bucket = mock 'bucket' + @config = mock 'config' + @trans = mock 'transaction' + + @settings.expects(:to_transportable).with(:whatever).returns(@bucket) + @bucket.expects(:to_configuration).returns(@config) + @config.expects(:apply).yields(@trans) + @config.stubs(:host_config=) + end + it "should provide a method that writes files with the correct modes" do pending "Not converted from test/unit yet" end @@ -518,6 +529,7 @@ describe Puppet::Util::Settings, " when being used to manage the host machine" d Puppet::Util::Storage.expects(:store).never Puppet::Util::Storage.expects(:load).never Dir.expects(:mkdir).with("/maindir") + Dir.expects(:mkdir).with("/seconddir") @settings.use(:main) end @@ -532,4 +544,11 @@ describe Puppet::Util::Settings, " when being used to manage the host machine" d @settings.use(:other) @settings.reuse end + + it "should fail if any resources fail" do + stub_transaction + @trans.expects(:any_failed?).returns(true) + + proc { @settings.use(:whatever) }.should raise_error(RuntimeError) + end end -- cgit