Changeset 3385 in MondoRescue

Timestamp:

May 13, 2015, 4:58:56 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix recursivity issues for perl modules detection in mindi, including a problem in the mageia function which wasn't reporting require not starting at star t of line, even if only spaces where before

File:

• branches/3.2/mindi/mindi-get-perl-modules (modified) (5 diffs)

branches/3.2/mindi/mindi-get-perl-modules

@@ -9 +9 @@
 use strict;
 
-use File::Find;
 use MondoRescue::File;
-
+use Data::Dumper;
+use File::Basename;
 
 =pod
@@ -56 +56 @@
 =cut
 
+my %files;
+my %found;
 
 my $file = mr_get_perl_modules(@ARGV) if (defined $ARGV[0]);
@@ -67 +69 @@
 sub mr_get_perl_modules {
 
-my %files;
+my %newly_found;
 
 #print "Searching in ";
 #print join "\n", @INC;
 
-my $require = mr_process_file(@_);
+my $require = mr_process_file(@_,"warnings");
+
+#print "Requires found:\n";
+#print Dumper($require);
+#print "---------------\n";
+
+my $cpt = keys %$require;
+
+# Exit recursion
+return({}) if ($cpt == 0);
 
 my @includes;
@@ -84 +95 @@
 }
 
-find(
-    sub {
-        if ((-f $File::Find::name) 
-            && (/\.pm$/) 
-            && (not defined $files{$File::Find::name})) {
-            foreach my $m (keys %$require,"warnings") {
-                (my $mod = $m) =~ s|::|/|g;
-                #print "Looking at $mod in $File::Find::name\n";
-                if (index($File::Find::name,"$mod.pm") ne -1) {
-                    $files{$File::Find::name} = $mod;
-                    #push @files, $File::Find::name;
-                    #print "Found $mod in $File::Find::name\n";
-                    last;
-                }
-            }
-        }
-    },
-    @includes);
+foreach my $m (keys %$require) {
+    (my $mod = $m) =~ s|::|/|g;
+    # Already found
+    next if (exists $found{$mod});
+    foreach my $d (@includes) {
+            #print "Looking at $m in $d\n";
+        if (-f "$d/$mod.pm") {
+            $files{"$d/$mod.pm"} = $mod;
+            $found{$mod} = "$d/$mod.pm";
+            $newly_found{"$d/$mod.pm"} = $mod;
+            #print "Found $mod in $d/$mod.pm\n";
+            last;
+        }
+    }
+    print "ERROR: Unable to find $mod. Your perl setup is incorrect\n" if (not exists $found{$mod});
+}
+                    
+#print "Files found:\n";
+#print Dumper(\%files);
+#print Dumper(\%found);
+#print "---------------\n";
+
+#print "New Files found:\n";
+#print Dumper(\%newly_found);
+#print "---------------\n";
 
 # Recurse on what we just found
-my $found = mr_process_file(keys %files);
-find(
-    sub {
-        if ((-f $File::Find::name) 
-            && (/\.pm$/) 
-            && (not defined $files{$File::Find::name})) {
-            foreach my $m (keys %$found) {
-                (my $mod = $m) =~ s|::|/|g;
-                #print "Looking at $mod in $File::Find::name\n";
-                if (index($File::Find::name,"$mod.pm") ne -1) {
-                    $files{$File::Find::name} = $mod;
-                    #push @files, $File::Find::name;
-                    #print "Found $mod in $File::Find::name\n";
-                    last;
-                }
-            }
-        }
-    },
-    @includes);
-
+my $foundrec = mr_get_perl_modules(keys %newly_found);
+
+# Cleanup
+foreach my $k (keys %newly_found) {
+    delete $newly_found{$k};
+}
+
+foreach my $k (sort keys %$foundrec) {
+    if (not defined $files{$k}) {
+        $files{$k} = $foundrec->{$k};
+    }
+}
 
 return(\%files);
@@ -209 +219 @@
             # as a fallback module or a rarely used option
 
-            ($whitespace ne "" && $statement eq "require") && next;
-    
+            ($whitespace !~ /^\s*$/ && $statement eq "require") && next;
+    
+            #print "*** $whitespace, $statement, $module, $version ***\n";
             # if there is some interpolation of variables just skip this
             # dependency, we do not want