diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-17 23:11:45 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-17 23:11:45 +0000 |
| commit | 8387d48a42e8893bbf71278ee807e12204027aaf (patch) | |
| tree | 0eb02ea0128689bdef106653d0d877c74dc153c0 /lib | |
| parent | 86c63ce2d9e93786cb27f9056b90f6887cbc8826 (diff) | |
| download | puppet-8387d48a42e8893bbf71278ee807e12204027aaf.tar.gz puppet-8387d48a42e8893bbf71278ee807e12204027aaf.tar.xz puppet-8387d48a42e8893bbf71278ee807e12204027aaf.zip | |
Fixing #540. I modified Puppet::Network::Client::Master so that it disables noop during its run, so that facts and plugins will always be downloaded.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2285 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index dd8a883bd..b244478c2 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -356,6 +356,9 @@ class Puppet::Network::Client::Master < Puppet::Network::Client Puppet.info "Retrieving #{args[:name]}s" + noop = Puppet[:noop] + Puppet[:noop] = false + begin trans = objects.evaluate trans.ignoretags = true @@ -381,6 +384,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client # Now clean up after ourselves objects.remove files + ensure + Puppet[:noop] = noop end # Retrieve facts from the central server. |