Reviewed in person with NickF and he'll merge it to 2.7.x. +1 On Fri, Jul 15, 2011 at 10:54 AM, nfagerlund <[email protected]> wrote: > The agent/apply/device man pages mentioned the 2 and 4 exit codes, but didn't > mention that they can combine to make 6 if there are both changes and > failures. > This commit adds the missing information to all three man pages. > > Signed-off-by: nfagerlund <[email protected]> > --- > Local-branch: ticket/2.7.x/8401-docs-detailed-exitcodes > lib/puppet/application/agent.rb | 8 ++++---- > lib/puppet/application/apply.rb | 7 ++++--- > lib/puppet/application/device.rb | 8 ++++---- > 3 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb > index f044264..ea7cbdf 100644 > --- a/lib/puppet/application/agent.rb > +++ b/lib/puppet/application/agent.rb > @@ -187,10 +187,10 @@ configuration options can also be generated by running > puppet agent with > should always at least contain MD5, MD2, SHA1 and SHA256. > > * --detailed-exitcodes: > - Provide transaction information via exit codes. If this is enabled, an > - exit code of '2' means there were changes, and an exit code of '4' > - means that there were failures during the transaction. This option > - only makes sense in conjunction with --onetime. > + Provide transaction information via exit codes. If this is enabled, an exit > + code of '2' means there were changes, an exit code of '4' means there were > + failures during the transaction, and an exit code of '6' means there were > both > + changes and failures. > > * --disable: > Disable working on the local system. This puts a lock file in place, > diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb > index 5562a9b..200309b 100644 > --- a/lib/puppet/application/apply.rb > +++ b/lib/puppet/application/apply.rb > @@ -82,9 +82,10 @@ configuration options can also be generated by running > puppet with > Enable full debugging. > > * --detailed-exitcodes: > - Provide transaction information via exit codes. If this is enabled, an > - exit code of '2' means there were changes, and an exit code of '4' > - means that there were failures during the transaction. > + Provide transaction information via exit codes. If this is enabled, an exit > + code of '2' means there were changes, an exit code of '4' means there were > + failures during the transaction, and an exit code of '6' means there were > both > + changes and failures. > > * --help: > Print this help message > diff --git a/lib/puppet/application/device.rb > b/lib/puppet/application/device.rb > index 3e2dec9..977c5c0 100644 > --- a/lib/puppet/application/device.rb > +++ b/lib/puppet/application/device.rb > @@ -113,10 +113,10 @@ parameter, so you can specify '--server <servername>' > as an argument. > Enable full debugging. > > * --detailed-exitcodes: > - Provide transaction information via exit codes. If this is enabled, an > - exit code of '2' means there were changes, and an exit code of '4' means > - that there were failures during the transaction. This option only makes > - sense in conjunction with --onetime. > + Provide transaction information via exit codes. If this is enabled, an exit > + code of '2' means there were changes, an exit code of '4' means there were > + failures during the transaction, and an exit code of '6' means there were > both > + changes and failures. > > * --help: > Print this help message > -- > 1.7.3.3 > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Developers" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en. > >
-- Join us for PuppetConf, September 22nd and 23rd in Portland, OR http://bit.ly/puppetconfsig -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
