diff options
| author | nfagerlund <nick.fagerlund@gmail.com> | 2011-07-15 11:55:12 -0700 |
|---|---|---|
| committer | nfagerlund <nick.fagerlund@gmail.com> | 2011-07-15 11:55:12 -0700 |
| commit | 833edd0abaa13cd71da0d200b593f3f63bc4b7b9 (patch) | |
| tree | c1c1264f262a22e23b452d2146db372b60918c69 | |
| parent | afc3616dc31f4a432410be4081a657726a257986 (diff) | |
| parent | d02000bf0060045eb27649ce2b433dcac34a7827 (diff) | |
| download | puppet-833edd0abaa13cd71da0d200b593f3f63bc4b7b9.tar.gz puppet-833edd0abaa13cd71da0d200b593f3f63bc4b7b9.tar.xz puppet-833edd0abaa13cd71da0d200b593f3f63bc4b7b9.zip | |
Merge branch 'ticket/2.7.x/8401-docs-detailed-exitcodes' into 2.7.x
| -rw-r--r-- | lib/puppet/application/agent.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/application/apply.rb | 7 | ||||
| -rw-r--r-- | 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 f0442648b..ea7cbdfb5 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 5562a9b09..200309b7d 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 3e2dec98c..977c5c023 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 |