lib/d3/admin/options.rb in depot3-3.0.11 vs lib/d3/admin/options.rb in depot3-3.0.13
- old
+ new
@@ -125,10 +125,15 @@
:label => "Auto-confirm",
:display_conversion => DISPLAY_TRUE_FALSE,
:get => nil,
:validate => nil
},
+ admin: {
+ :cli => ['--admin', GetoptLong::REQUIRED_ARGUMENT ],
+ :arg => 'admin',
+ :help => "who is doing something with d3?"
+ },
# Package Identification: Add/Edit/Info/Delete
package_name: {
:default => nil,
@@ -272,18 +277,19 @@
:label => "Uninstalls older installs",
:display_conversion => DISPLAY_TRUE_FALSE,
:get => :get_remove_first,
:validate => :validate_yes_no
},
- prohibiting_process: {
+ prohibiting_processes: {
:default => nil,
- :cli => [ '--prohibiting-process', '-x', GetoptLong::REQUIRED_ARGUMENT ],
+ :cli => [ '--prohibiting-processes', '--prohibiting-process', '-x', GetoptLong::REQUIRED_ARGUMENT ],
:label => "Installation prohibited by processes matching",
- :display_conversion => DISPLAY_DFT_NONE,
- :get => :get_prohibiting_process,
+ :display_conversion => DISPLAY_COMMA_SEP_LIST,
+ :get => :get_prohibiting_processes,
:unsetable => true,
- :validate => :validate_prohibiting_process
+ :validate => :validate_prohibiting_processes,
+ :compare => Proc.new{|o,n| o.to_a.sort == n.to_a.sort}
},
auto_groups: {
:default => nil,
:cli => [ '--auto-groups', '-g', GetoptLong::REQUIRED_ARGUMENT ],
:label => "Auto installed for groups",
@@ -353,10 +359,11 @@
:cli => [ '--expiration-path', '--expiration-paths', '-P', GetoptLong::REQUIRED_ARGUMENT ],
:label=> "Expiration Path(s)",
:display_conversion => D3::Database::ARRAY_OF_PATHNAMES_TO_COMMA_STRING ,
:get => :get_expiration_paths,
:unsetable => true,
- :validate => :validate_expiration_paths
+ :validate => :validate_expiration_paths,
+ :compare => Proc.new{|o,n| o.to_a.sort == n.to_a.sort}
},
description: {
:default => '',
:cli => [ '--description', '-d', GetoptLong::REQUIRED_ARGUMENT ],
:label => "Description",