Changeset 110

Timestamp:

Jun 7, 2012, 9:58:43 PM (13 years ago)

Author:

g7moreau

Message:

• remove GetOptionsFromArray? to only use GetOptions? (for older perl version)

File:

• trunk/klask (modified) (10 diffs)

trunk/klask

@@ -17 +17 @@
 use Net::CIDR::Lite;
 use NetAddr::IP;
-use Getopt::Long qw(GetOptions GetOptionsFromArray);
+use Getopt::Long qw(GetOptions);
 use Socket;
 use List::Util 'shuffle';
@@ -29 +29 @@
 my $KLASK_DB_FILE  = "$KLASK_VAR/klaskdb";
 my $KLASK_SW_FILE  = "$KLASK_VAR/switchdb";
-
-#my $DEBUG = 0;
-#GetOptionsFromArray(\@ARGV,
-#   'debug|d=i'   => \$DEBUG,
-#   );
 
 test_running_environnement();
@@ -826 +821 @@
 
 sub cmd_cleandb {
-   my @options = @_;
+   my @ARGV  = @_;
 
    my $days_to_clean = 15;
@@ -832 +827 @@
    my $database_has_changed;
 
-   my $ret = GetOptionsFromArray(\@options,
+   my $ret = GetOptions(
       'day|d=i'   => \$days_to_clean,
       'verbose|v' => \$verbose,
@@ -923 +918 @@
 
 sub cmd_exportdb {
-   my @ARGV   = @_;
+   my @ARGV = @_;
 
    my $format = 'txt';
@@ -1215 +1210 @@
 
 sub cmd_ip_free {
-   my @vlan_name = @_;
+   my @ARGV = @_; # VLAN name with option
 
    my $days_to_dead = 365 * 2;
@@ -1221 +1216 @@
    my $verbose;
 
-   my $ret = GetOptionsFromArray(\@vlan_name,
+   my $ret = GetOptions(
       'day|d=i'      => \$days_to_dead,
       'format|f=s'   => \$format,
@@ -1234 +1229 @@
    $format = 'txt' if not defined $possible_format{$format};
 
+   my @vlan_name = @ARGV;
    @vlan_name = get_list_network() if not @vlan_name;
 
@@ -1414 +1410 @@
 
 sub cmd_updatesw {
-   my @options = @_;
+   my @ARGV = @_;
 
    my $verbose;
 
-   my $ret = GetOptionsFromArray(\@options,
+   my $ret = GetOptions(
       'verbose|v' => \$verbose,
       );
@@ -1614 +1610 @@
 
 sub cmd_exportsw {
-   my @ARGV   = @_;
+   my @ARGV = @_;
 
    test_switchdb_environnement();