Changeset 3795 in MondoRescue for branches/3.3/MondoRescue


Ignore:
Timestamp:
Feb 15, 2024, 3:55:18 PM (4 months ago)
Author:
Bruno Cornec
Message:

Untag v3.3.0 never really published in the past - will start from here

Location:
branches/3.3/MondoRescue
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3/MondoRescue/lib/MondoRescue/File.pm

    r3742 r3795  
    156156        if (defined $link) {
    157157            $link = mr_file_normalize($link,"$curdir/$dir");
    158             # It's a real symlink so handle it
    159             $files->{$f}->{"$curdir/$dir"} = 1;
     158            # It's a real symlink on a file so handle it
     159            $files->{$f}->{"$curdir/$dir"} = 1 if ((not -d $link) && (not -d "/$link"));
    160160            if (substr($link,0,1) eq "/") {
    161161                $curdir = $link;
    … …  
    170170                foreach my $k (keys %$h) {
    171171                    foreach my $l (keys %$k) {
    172                         # Use $f as key as we affects all the files
     172                        # Use $f as key as we affect all the files
    173173                        # found in recursion to the current managed file
    174174                        $files->{$f}->{$l} = 1;

  • branches/3.3/MondoRescue/t/01-read-all-link.t

    r3772 r3795  
    77# Create the structure for the tests
    88my $bd = tempdir(
    9     CLEANUP => 1
     9    #CLEANUP => 1
    1010    );
    1111
    … …  
    2323copy "/usr/bin/perl","usr/bin" || die "$!";
    2424chmod 0755,"usr/bin/perl";
    25 my $libc;
    2625foreach my $f (<"/lib/libc.so.[0-9]*">) {
    2726    copy "$f","usr/lib" || die "$!";
    28     $libc = $f;
    2927}
    3028
    … …  
    5755    );
    5856
    59 my $more = 1;
    60 
    61 eval
    62 {
    63         require Test::More;
    64         Test::More->import();
    65         no_plan();
     57eval {
     58    require Test;
     59    Test->import();
    6660};
    67 # Test::More not found so simpler test
    6861if ($@) {
    69     $more = 0;
    70     eval {
    71         require Test;
    72         Test->import();
    73     };
    74     if ($@) {
    75         require Test::Simple;
    76         Test::Simple->import();
    77     }
     62        require Test::Simple;
     63    Test::Simple->import();
    7864}
    7965plan(tests => 12);
    … …  
    9783sub myis {
    9884
    99 if ($more eq 1) {
    100     return(is(@_));
    101 } else {
    102     my $p1 = shift;
    103     my $p2 = shift;
    104     my $p3 = shift;
    105     print "# test $p3\n";
    106     return(ok($p1,$p2));
     85my $p1 = shift;
     86my $p2 = shift;
     87my $p3 = shift;
     88print "# test $p3\n";
     89return(ok($p1,$p2));
    10790}
    108 }
    109 
Note: See TracChangeset for help on using the changeset viewer.