Ignore:
Timestamp:
Aug 2, 2007, 12:26:40 AM (13 years ago)
Author:
Bruno Cornec
Message:
  • Improve tape support doc (Tilman Schmidt <tilman_at_imap.cc>)
  • mdadm.conf files added to deplist
  • Fix gentoo issues again (Francesco Talamona ti.liame_at_email.it)
  • Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

(merge -r1579:1590 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

    r1555 r1591  
    298298    if (res) {
    299299        log_OS_error(command);
     300        log_msg(2, tmp);
    300301    }
    301302    mr_free(command);
     
    503504    long q = 0L;
    504505    char *tmp = NULL;
     506    char *new = NULL;
     507    char *cwd = NULL;
     508
     509    malloc_string(new);
     510    malloc_string(cwd);
    505511
    506512  /**************************************************************************
     
    546552                            ("Warning - differences found during the compare phase"));
    547553    }
    548 
    549     retval += unmount_all_devices(mountlist);
    550554
    551555    if (count_lines_in_file("/tmp/changed.txt") > 0) {
     
    575579
    576580            mr_msg(2, "calling popup_changelist_from_file()");
     581            getcwd(cwd, MAX_STR_LEN - 1);
     582            chdir(bkpinfo->restore_path);
     583            getcwd(new, MAX_STR_LEN - 1);
    577584            popup_changelist_from_file("/tmp/changed.files");
    578585            mr_msg(2, "Returning from popup_changelist_from_file()");
     586            chdir(cwd);
    579587        }
    580588    } else {
     
    583591             ("No significant differences were found. Your backup is perfect."));
    584592    }
     593    retval += unmount_all_devices(mountlist);
     594
    585595    kill_petris();
     596    paranoid_free(new);
     597    paranoid_free(cwd);
    586598    return (retval);
    587599}
Note: See TracChangeset for help on using the changeset viewer.