Issue #7699 has been updated by Jeff McCune. Status changed from In Topic Branch Pending Merge to Merged - Pending Release
# Merged into 2.7.x # With the +1 from Daniel for Dan's code, I cherry picked the change which was based on master into the 2.7.x branch since this is a bugfix and not a new feature. <pre> commit b7ee0258ab40478329c20177eda9b250f27ede18 Merge: 8fe2e55 ae3ef42 Author: Jeff McCune <[email protected]> Date: Sun Jul 10 13:04:20 2011 -0700 Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.7.x * ticket/2.7.x/7699_fix_help_listing_options_twice: (#7699) - Help should only show options once commit ae3ef423c03b7ef27f975dadfb67bf77ca481503 Author: Dan Bode <[email protected]> Date: Wed Jul 6 21:59:05 2011 -0700 (#7699) - Help should only show options once puppet help was reprinting every option once for every alias that is had. This fix involves only storing the option.name in the @options instance var for both face and actions options. The @options_hash still maintains the list of options and aliases as its keys. Reviewed-by: Daniel Pittman (puppet-dev list) </pre> ---------------------------------------- Bug #7699: puppet help type command lists options twice for actions with option alias https://projects.puppetlabs.com/issues/7699 Author: Dan Bode Status: Merged - Pending Release Priority: Normal Assignee: Daniel Pittman Category: Faces Target version: 2.7.0 Affected Puppet version: 2.7.0rc2 Keywords: Branch: https://github.com/bodepd/puppet/tree/issue/master/7699 given the following face action: <pre> action :install do option '--version version' do summary "Version to install (can be a requirement, eg '>= 1.0.3', defaults to latest version)" end summary "Install a module (eg, 'user-modname') from a repository or file" examples "puppet module install MODULE_NAME_OR_FILE [OPTIONS]" option '--puppet_module_repository repo', '-r repo' do summary 'Module repo to use' end option '--force', '-f' do summary "Force overwrite of existing module, if any" end when_invoked do |name, options| Puppet::Module::Tool::Applications::Installer.run(name, options) end end </pre> when I retrieve help for the action: <pre> puppet help module install puppet module install(1) -- Install a module (eg, 'user-modname') from a repository or file =========================================================================================== SYNOPSIS -------- puppet module install [--version version][--puppet_module_repository repo | -r repo][--puppet_module_repository repo | -r repo][--force | -f][--force | -f] OPTIONS ------- --force |-f Force overwrite of existing module, if any --force |-f Force overwrite of existing module, if any --puppet_module_repository repo |-r repo Module repo to use --puppet_module_repository repo |-r repo Module repo to use --version version Version to install (can be a requirement, eg '>= 1.0.3', defaults to latest version) EXAMPLES -------- puppet module install MODULE_NAME_OR_FILE [OPTIONS] COPYRIGHT AND LICENSE --------------------- Unknown copyright owner and years. All Rights Reserved </pre> options that have an alias specified are mentioned twice: ie: <pre> option '--version version' - appears once in the help --version version Version to install (can be a requirement, eg '>= 1.0.3', defaults to latest version) option '--force', '-f' do - appears twice OPTIONS ------- --force |-f Force overwrite of existing module, if any --force |-f Force overwrite of existing module, if any </pre> -- You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://projects.puppetlabs.com/my/account -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" 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-bugs?hl=en.
