Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r686:728 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

    r688 r729  
    13521352    paranoid_free(format_str);
    13531353
    1354     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
    1355         || !strcmp(mountlist->el[currline].mountpoint, "image")) {
    1356         mountlist->el[currline].size =
    1357             calculate_raid_device_size(mountlist, raidlist,
     1354    if (strcmp(mountlist->el[currline].mountpoint, "image")) {
     1355        if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
     1356            mountlist->el[currline].size =
     1357                calculate_raid_device_size(mountlist, raidlist,
    13581358                                       mountlist->el[currline].device);
    1359     } else {
    1360         mountlist->el[currline].size = atol(size_str) * 1024;
     1359        } else {
     1360            mountlist->el[currline].size = atol(size_str) * 1024;
     1361        }
    13611362    }
    13621363    paranoid_free(size_str);
Note: See TracChangeset for help on using the changeset viewer.