Changeset 3383 in MondoRescue

Timestamp:

May 12, 2015, 2:16:38 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi-get-perl-modules to get all modules in dependency as well (pb with Expoerter module missing during UEFI tests)

Location:

branches/3.2

Files:

• mindi/mindi-get-perl-modules (modified) (2 diffs)
• mindi/mr-parted2fdisk (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -62 +62 @@
     print "$f\n";
 }
+
+exit 0;
 
 sub mr_get_perl_modules {
@@ -101 +103 @@
     @includes);
 
+# 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);
+
+
 return(\%files);
 }
 
-# Adapted From /usr/lib/rpm/mandriva/perl.req
+# Adapted From /usr/lib/rpm/mageia/perl.req
 # by Ken Estes Mail.com kestes@staff.mail.com
 # used under the GPL

branches/3.2/mindi/mr-parted2fdisk

@@ -223 +223 @@
 close(CMD);
 chomp($version);
-# RHEL 5 has fdisk (util-linux 2.13-pre7)
+# RHEL 5 has fdisk from util-linux 2.13-pre7
 # Mageia 4 has fdisk from util-linux 2.24.2
 $version =~ s/[^0-9\.]*([0-9a-z\.-]+)[\)]*$/$1/;

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1704 +1704 @@
         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Modifying fstab and restoring MBR...                           ");
+        mvaddstr_and_log_it(g_currentY, 0, "Modifying fstab and restoring MBR...                           ");
         for (done = FALSE; !done;) {
             if (!run_program_and_log_output("which vi", FALSE)) {
@@ -1738 +1737 @@
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Restoring MBR...                                               ");
+        mvaddstr_and_log_it(g_currentY, 0, "Restoring MBR...                                               ");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1745 +1743 @@
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-        log_to_screen
-            ("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE);
+        log_to_screen("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE);
     } else {
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");