diff options
| -rw-r--r-- | lib/puppet/config.rb | 8 | ||||
| -rwxr-xr-x | test/other/config.rb | 21 |
2 files changed, 29 insertions, 0 deletions
diff --git a/lib/puppet/config.rb b/lib/puppet/config.rb index 7af3a72d9..bcfdabd90 100644 --- a/lib/puppet/config.rb +++ b/lib/puppet/config.rb @@ -525,8 +525,16 @@ Generated on #{Time.now}. objects = bucket.to_type objects.finalize + tags = nil + if Puppet[:tags] + tags = Puppet[:tags] + Puppet[:tags] = "" + end trans = objects.evaluate trans.evaluate + if tags + Puppet[:tags] = tags + end # Remove is a recursive process, so it's sufficient to just call # it on the component. diff --git a/test/other/config.rb b/test/other/config.rb index 95eab3b4d..457010ac0 100755 --- a/test/other/config.rb +++ b/test/other/config.rb @@ -625,6 +625,27 @@ inttest = 27 config.handlearg("--no-booltest", "false") assert_equal(false, config[:booltest], "Boolean was not converted") end + + # Make sure that tags are ignored when configuring + def test_configs_ignore_tags + config = mkconfig + file = tempfile() + + config.setdefaults(:mysection, + :mydir => [file, "a file"] + ) + + Puppet[:tags] = "yayness" + + assert_nothing_raised { + config.use(:mysection) + } + + assert(FileTest.directory?(file), "Directory did not get created") + + assert_equal("yayness", Puppet[:tags], + "Tags got changed during config") + end end # $Id$ |