Changeset 979 for trunk/mondo/src


Ignore:
Timestamp:
Nov 26, 2006, 12:35:32 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r954:978 $SVN_M/branches/stable

Location:
trunk/mondo/src/common
Files:
2 edited

Legend:

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

    r914 r979  
    14621462    bkpinfo->use_lzo =
    14631463        (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
    1464 
    1465 /*
    1466   if (find_home_of_exe("star") && (!find_home_of_exe("afio") || find_home_of_exe("selinuxenabled")))
    1467     {
    1468       bkpinfo->use_star = FALSE;   
    1469       bkpinfo->use_lzo = FALSE;
    1470       log_to_screen("Using star, not afio");
    1471       if (!find_home_of_exe("afio"))
    1472     { log_to_screen("...because afio not found"); }
    1473       if (find_home_of_exe("selinuxenabled"))
    1474     { log_to_screen("...because SELINUX found"); }
    1475     }
    1476 */
    1477 
    14781464    mvaddstr_and_log_it(2, 0, " ");
    14791465
  • trunk/mondo/src/common/libmondo-stream.c

    r956 r979  
    346346    int res = 0;
    347347    int retval = 0;
    348     char *fname = (char *)&res;         /* Should NOT be NULL */
     348    char *fname = (char *)&res;                 /* Should NOT be NULL */
    349349
    350350// xattr
Note: See TracChangeset for help on using the changeset viewer.