summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-24 21:33:13 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-24 21:33:13 +0000
commit142d0fa46860eb5390efbcccca51c57b6b689fe6 (patch)
tree6954b0523d4d3b249285438fd045fbecfea477cf
parent2c3abbeef6298683dd199f2a5e663caaaa88dffa (diff)
downloadpuppet-142d0fa46860eb5390efbcccca51c57b6b689fe6.tar.gz
puppet-142d0fa46860eb5390efbcccca51c57b6b689fe6.tar.xz
puppet-142d0fa46860eb5390efbcccca51c57b6b689fe6.zip
Applying patch by Ian Burrell from #559
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2351 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xbin/puppetd2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/puppetd b/bin/puppetd
index 4c9bfa697..981e2c1ae 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -397,7 +397,7 @@ if Puppet[:listen] and ! options[:onetime]
end
objects << server
-elsif options[:onetime]
+elsif options[:onetime] and Puppet[:listen]
Puppet.notice "Ignoring --listen on onetime run"
end