Skip to content

Commit

Permalink
drop deprecated options
Browse files Browse the repository at this point in the history
keeping documentation and behaviour consistent is quite difficult
already, so let's reduce complexity by dropping options tagged as
deprecated in previous major release.
  • Loading branch information
guillomovitch committed Jul 9, 2012
1 parent ba67e10 commit 3dc0a79
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 89 deletions.
15 changes: 0 additions & 15 deletions fusioninventory-agent
Expand Up @@ -56,21 +56,6 @@ GetOptions(
'wait|w=s',
# deprecated options
'stdout',
'daemon-no-fork|D',
'devlib',
'no-ocsdeploy',
'no-inventory',
'no-wakeonlan',
'no-snmpquery',
'no-netdiscovery',
'no-printer',
'no-software',
'rpc-trust-localhost',
'rpc-port',
'rpc-ip',
'no-socket',
'realm',
'info|i',
) or pod2usage(-verbose => 0);

pod2usage(-verbose => 0) if $options->{help};
Expand Down
76 changes: 2 additions & 74 deletions lib/FusionInventory/Agent/Config.pm
Expand Up @@ -36,86 +36,14 @@ my $default = {
'httpd-trust' => undef,
'scan-homedirs' => undef,
'server' => undef,
'stdout' => undef,
'tag' => undef,
'timeout' => undef,
'timeout' => 180,
'user' => undef,
# deprecated options
'no-ocsdeploy' => undef,
'no-inventory' => undef,
'no-wakeonlan' => undef,
'no-snmpquery' => undef,
'no-netdiscovery' => undef,
'no-printer' => undef,
'no-software' => undef,
'rpc-trust-localhost' => undef,
'rpc-port' => undef,
'rpc-ip' => undef,
'no-socket' => undef,
'realm' => undef,
'info' => undef,
'timeout' => 180,
'stdout' => undef,
};

my $deprecated = {
'info' => {
message => 'it was useless anyway'
},
'realm' => {
message => 'it is now useless'
},
'no-socket' => {
message => 'use --no-httpd option instead',
new => 'no-httpd'
},
'rpc-ip' => {
message => 'use --httpd-ip option instead',
new => 'httpd-ip'
},
'rpc-port' => {
message => 'use --httpd-port option instead',
new => 'httpd-port'
},
'rpc-trust-localhost' => {
message => 'use --httpd-trust 127.0.0.1 option instead',
new => { 'httpd-trust' => '127.0.0.1' }
},
'daemon-no-fork' => {
message => 'use --daemon and --no-fork options instead',
new => [ 'daemon', 'no-fork' ]
},
'D' => {
message => 'use --daemon and --no-fork options instead',
new => [ 'daemon', 'no-fork' ]
},
'no-inventory' => {
message => 'use --no-task inventory option instead',
new => { 'no-task' => 'inventory' }
},
'no-wakeonlan' => {
message => 'use --no-task wakeonlan option instead',
new => { 'no-task' => 'wakeonlan' }
},
'no-netdiscovery' => {
message => 'use --no-task netdiscovery option instead',
new => { 'no-task' => 'netdiscovery' }
},
'no-snmpquery' => {
message => 'use --no-task snmpquery option instead',
new => { 'no-task' => 'snmpquery' }
},
'no-ocsdeploy' => {
message => 'use --no-task ocsdeploy option instead',
new => { 'no-task' => 'ocsdeploy' }
},
'no-printer' => {
message => 'use --no-category printer option instead',
new => { 'no-category' => 'printer' }
},
'no-software' => {
message => 'use --no-category software option instead',
new => { 'no-category' => 'software' }
},
'stdout' => {
message => 'use --local - option instead',
new => { 'local' => '-' }
Expand Down

0 comments on commit 3dc0a79

Please sign in to comment.