diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 12:02:21 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 12:02:21 -0700 |
| commit | 058cc39227112cefc637d38fd67d471945b2d4aa (patch) | |
| tree | 9bb4a6f963f973b439e0dbe5c348e9497aef06fe /lib/puppet/application | |
| parent | f80afbe72b848fe4ed81d8116d4eeb494aa6f61e (diff) | |
| parent | 1f438da968e1583d900903407c2e5b17648fa937 (diff) | |
| download | puppet-058cc39227112cefc637d38fd67d471945b2d4aa.tar.gz puppet-058cc39227112cefc637d38fd67d471945b2d4aa.tar.xz puppet-058cc39227112cefc637d38fd67d471945b2d4aa.zip | |
Merge branch '2.6.x' into 2.7.next
Fix conflicts in the changelog, and one agent spec in favour of the 2.7.next
version of the code.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/agent.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index fc8616817..19849c57a 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -378,8 +378,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License end def setup_listen - unless FileTest.exists?(Puppet[:authconfig]) - Puppet.err "Will not start without authorization file #{Puppet[:authconfig]}" + unless FileTest.exists?(Puppet[:rest_authconfig]) + Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}" exit(14) end |