Changeset 3383 in MondoRescue


Ignore:
Timestamp:
May 12, 2015, 2:16:38 AM (6 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi-get-perl-modules

    r3231 r3383  
    6262    print "$f\n";
    6363}
     64
     65exit 0;
    6466
    6567sub mr_get_perl_modules {
     
    101103    @includes);
    102104
     105# Recurse on what we just found
     106my $found = mr_process_file(keys %files);
     107find(
     108    sub {
     109        if ((-f $File::Find::name)
     110            && (/\.pm$/)
     111            && (not defined $files{$File::Find::name})) {
     112            foreach my $m (keys %$found) {
     113                (my $mod = $m) =~ s|::|/|g;
     114                #print "Looking at $mod in $File::Find::name\n";
     115                if (index($File::Find::name,"$mod.pm") ne -1) {
     116                    $files{$File::Find::name} = $mod;
     117                    #push @files, $File::Find::name;
     118                    #print "Found $mod in $File::Find::name\n";
     119                    last;
     120                }
     121            }
     122        }
     123    },
     124    @includes);
     125
     126
    103127return(\%files);
    104128}
    105129
    106 # Adapted From /usr/lib/rpm/mandriva/perl.req
     130# Adapted From /usr/lib/rpm/mageia/perl.req
    107131# by Ken Estes Mail.com kestes@staff.mail.com
    108132# used under the GPL
  • branches/3.2/mindi/mr-parted2fdisk

    r3377 r3383  
    223223close(CMD);
    224224chomp($version);
    225 # RHEL 5 has fdisk (util-linux 2.13-pre7)
     225# RHEL 5 has fdisk from util-linux 2.13-pre7
    226226# Mageia 4 has fdisk from util-linux 2.24.2
    227227$version =~ s/[^0-9\.]*([0-9a-z\.-]+)[\)]*$/$1/;
  • branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

    r3301 r3383  
    17041704        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
    17051705        /* interactive mode */
    1706         mvaddstr_and_log_it(g_currentY, 0,
    1707                             "Modifying fstab and restoring MBR...                           ");
     1706        mvaddstr_and_log_it(g_currentY, 0, "Modifying fstab and restoring MBR...                           ");
    17081707        for (done = FALSE; !done;) {
    17091708            if (!run_program_and_log_output("which vi", FALSE)) {
     
    17381737        log_msg(2, "run_raw_mbr() --- command='%s'", command);
    17391738
    1740         mvaddstr_and_log_it(g_currentY, 0,
    1741                             "Restoring MBR...                                               ");
     1739        mvaddstr_and_log_it(g_currentY, 0, "Restoring MBR...                                               ");
    17421740        res = run_program_and_log_output(command, 3);
    17431741        mr_free(command);
     
    17451743    if (res) {
    17461744        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    1747         log_to_screen
    1748             ("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE);
     1745        log_to_screen("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE);
    17491746    } else {
    17501747        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
Note: See TracChangeset for help on using the changeset viewer.