Changeset 3262 in MondoRescue for branches/3.2/MondoRescue/bin

Timestamp:

Apr 20, 2014, 11:24:46 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Change interface of mr_file_read_all_link to returning a hash of hash.
• When recursing with a hash used, declare it with our so it's available correctly at all levels.
• mr_file_read_all_link now really returns all the links neeed

File:

• branches/3.2/MondoRescue/bin/mr-read-all-link (modified) (2 diffs)

branches/3.2/MondoRescue/bin/mr-read-all-link

@@ -10 +10 @@
 use Data::Dumper;
 use MondoRescue::File;
+# For pbdebug
+use ProjectBuilder::Base;
 
 =pod
@@ -54 +56 @@
 =cut
 
+$pbdebug = 2 if ((defined $ARGV[0]) && ($ARGV[0] eq "-v"));
 
 my $file = mr_file_read_all_link(@ARGV) if (defined $ARGV[0]);
-
-my $verbose = undef;
-$verbose = 1 if ((defined $ARGV[0]) && ($ARGV[0] eq "-v"));
+my %h;
 
 #print Dumper($file);
 
 foreach my $f (sort keys %$file) {
-    print "$f\n" if (defined $verbose);
-    print "--\n" if (defined $verbose);
+    print "$f\n" if ($pbdebug >= 1);
+    print "--\n" if ($pbdebug >= 1);
     #print Dumper($f);
-    foreach my $l (@{$file->{$f}}) {
-        print "$l\n";
+    foreach my $l (sort keys $file->{$f}) {
+        print "==" if ($pbdebug >= 1);
+        print "$l\n" if ($pbdebug >= 1);
+        $h{$l} = 1;
     }
-    print "--\n" if (defined $verbose);
+    print "--\n" if ($pbdebug >= 1);
 }
+
+foreach my $l (sort keys %h) {
+    print "$l\n";
+}