diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-03 14:55:14 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-03 14:55:14 -0700 |
| commit | b17b49c97380cd64e75ac5e2ef12fb939ae953bb (patch) | |
| tree | b285f8ae0a1c7359632e81f5b10655bb64145f36 /lib/puppet/face | |
| parent | b7ba66c8ebd7d59de40188a70b4e6fa0ddd8d2ad (diff) | |
| parent | 5120a95830183fdb30fc178452bfc3e6f44605b7 (diff) | |
| download | puppet-b17b49c97380cd64e75ac5e2ef12fb939ae953bb.tar.gz puppet-b17b49c97380cd64e75ac5e2ef12fb939ae953bb.tar.xz puppet-b17b49c97380cd64e75ac5e2ef12fb939ae953bb.zip | |
Merge branch 'bug/2.7.x/7276-return-value-from-plugin-download-is-not-user-friendly' into 2.7.x
Diffstat (limited to 'lib/puppet/face')
| -rw-r--r-- | lib/puppet/face/plugin.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/puppet/face/plugin.rb b/lib/puppet/face/plugin.rb index 19060942a..4b45ed3a1 100644 --- a/lib/puppet/face/plugin.rb +++ b/lib/puppet/face/plugin.rb @@ -7,6 +7,10 @@ Puppet::Face.define(:plugin, '0.0.1') do action :download do summary "Download plugins from the configured master" + returns <<-EOT + An array containing the files actually downloaded. + This will be empty array when everything was in sync. + EOT when_invoked do |options| require 'puppet/configurer/downloader' @@ -15,5 +19,13 @@ Puppet::Face.define(:plugin, '0.0.1') do Puppet[:pluginsource], Puppet[:pluginsignore]).evaluate end + + when_rendering :for_humans do |value| + if value.empty? then + "No plugins downloaded." + else + "Downloaded these plugins: #{value.join(', ')}" + end + end end end |