Changeset 334


Ignore:
Timestamp:
Jan 19, 2006, 11:30:00 PM (14 years ago)
Author:
bcornec
Message:

merge -r319:333 $SVN_M/branches/2.06

Location:
trunk
Files:
1 edited
1 copied

Legend:

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

    r276 r334  
    13571357        // 2.6 has /sys as a proc-type thing -- must be excluded
    13581358        asprintf(&tmp,
    1359                  "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
     1359                 "find %s -maxdepth %d -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
    13601360                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
    13611361#else
    13621362        // On BSD, for example, /sys is the kernel sources -- don't exclude
    13631363        asprintf(&tmp,
    1364                  "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -type d -a -print > %s 2> /dev/null",
     1364                 "find %s -maxdepth %d -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
    13651365                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
    13661366#endif
     
    16061606        asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
    16071607" MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
    1608 /proc /sys /tmp /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
     1608/proc /sys /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
    16091609
    16101610        log_msg(2, "Excluding paths = '%s'", exclude_paths);
Note: See TracChangeset for help on using the changeset viewer.