Changeset 1043 in MondoRescue for trunk/mondo/src/common/libmondo-verify.c


Ignore:
Timestamp:
Jan 8, 2007, 11:31:22 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r978:1042 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-verify.c

    r956 r1043  
    238238        if (bkpinfo->use_lzo) {
    239239            mr_asprintf(&sz_exe, "lzop");
     240        else if (bkpinfo->use_gzip) {
     241            strcpy(sz_exe, "gzip");
     242        } else if (bkpinfo->use_gzip) {
     243            strcpy(sz_exe, "gzip");
    240244        } else {
    241245            mr_asprintf(&sz_exe, "bzip2");
     
    409413        mr_allocstr(bkpinfo->zip_suffix, "lzo");
    410414        bkpinfo->use_lzo = TRUE;
     415        bkpinfo->use_gzip = FALSE;
     416    }
     417    if (strstr(tarball_fname, ".gz")
     418        && strcmp(bkpinfo->zip_suffix, "gz")) {
     419        log_msg(2, "OK, I'm going to start using gzip.");
     420        strcpy(bkpinfo->zip_exe, "gzip");
     421        strcpy(bkpinfo->zip_suffix, "gz");
     422        bkpinfo->use_lzo = FALSE;
     423        bkpinfo->use_gzip = TRUE;
    411424    }
    412425    if (strstr(tarball_fname, ".bz2")
     
    416429        mr_allocstr(bkpinfo->zip_suffix, "bz2");
    417430        bkpinfo->use_lzo = FALSE;
     431        bkpinfo->use_gzip = FALSE;
    418432    }
    419433    unlink(outlog);
Note: See TracChangeset for help on using the changeset viewer.