From 3dc0a7922cfa5ded41cd41c2f989bc676ef37c84 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillomovitch@gmail.com>
Date: Mon, 9 Jul 2012 10:30:46 +0200
Subject: [PATCH] drop deprecated options

keeping documentation and behaviour consistent is quite difficult
already, so let's reduce complexity by dropping options tagged as
deprecated in previous major release.
---
 fusioninventory-agent               | 15 ------
 lib/FusionInventory/Agent/Config.pm | 76 +----------------------------
 2 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/fusioninventory-agent b/fusioninventory-agent
index 0fcbed4436..2fe26f6801 100755
--- a/fusioninventory-agent
+++ b/fusioninventory-agent
@@ -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};
diff --git a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
index a30fa81e47..5a877902ae 100644
--- a/lib/FusionInventory/Agent/Config.pm
+++ b/lib/FusionInventory/Agent/Config.pm
@@ -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' => '-' }