Changeset 366 for trunk

Timestamp:

Sep 17, 2018, 1:54:16 PM (6 years ago)

Author:

g7moreau

Message:

• Mostly better print msg

File:

• trunk/ddt/ddt (modified) (5 diffs)

trunk/ddt/ddt

@@ -21 +21 @@
 use strict;
 #use warnings;
-use version; our $VERSION = version->declare('0.11.9');
+use version; our $VERSION = version->declare('0.12.0');
 
 use Getopt::Long qw(GetOptions);
@@ -1066 +1066 @@
 
    if ($tags !~ m/^ (?:\w+,)* \w+ $/xms) {
-      die "Error: bad format for tags (comma separated list): $tags\n";
+      die "Error: bad format for tags (comma separated list): $tags [FAILED]\n";
       }
 
    for my $tag (split/,/, $tags) {
       next if $tag eq 'universal';
-      die "Error: TAG doesn't exist in the database. Create it before with create_tag: $tag\n" if not exists $computer_db->{'tag'}{$tag};
+      die "Error: TAG $tag doesn't exist in the database. Create $tag with command create_tag [FAILED]\n" if not exists $computer_db->{'tag'}{$tag};
       }
 
@@ -1091 +1091 @@
       delete $attribute->{'tag'} if $tags eq 'universal';
       ipamdb_save("$COMPUTER_YAML", $computer_db);
+      print "Info: update host $hostname sector $sector tags $tags [OK]\n";
       exit;
       }
-   print "Mise à jour du commentaire de la machine [FAILED]\n";
-   print "L'adresse MAC: $mac n'existe pas dans le domaine: $sector.\n";
+   die "Error: no host $hostname in sector $sector has MAC $mac [FAILED]\n";
    }
 
@@ -1135 +1135 @@
       next LOOP_ON_COMPUTER if $attribute->{'hostname'} ne $hostname;
 
-      die "Warning: host $hostname already of type $type\n" if $attribute->{'address_type'} eq $type;
+      die "Warning: host $hostname already of type $type [FAILED]\n" if $attribute->{'address_type'} eq $type;
 
       $attribute->{'address_type'}  = $type;
@@ -1141 +1141 @@
 
       ipamdb_save("$COMPUTER_YAML", $computer_db);
+      print "Info: update host $hostname sector $sector type $type [OK]\n";
       exit;
       }