Ignore:
Timestamp:
Jan 19, 2006, 11:32:46 PM (15 years ago)
Author:
bcornec
Message:

merge -r333:335 $SVN_M/branches/2.06
Last merge from 2.06 normaly.

File:
1 edited

Legend:

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

    r332 r336  
    15341534        // 2.6 has /sys as a proc-type thing -- must be excluded
    15351535        sprintf(tmp,
    1536                 "find %s -maxdepth %d -path /proc -prune -o -path -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
     1536                "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",
    15371537                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
    15381538#else
    15391539        // On BSD, for example, /sys is the kernel sources -- don't exclude
    15401540        sprintf(tmp,
    1541                 "find %s -maxdepth %d -path /proc -prune -o -path -prune -o -type d -a -print > %s 2> /dev/null",
     1541                "find %s -maxdepth %d -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
    15421542                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
    15431543#endif
Note: See TracChangeset for help on using the changeset viewer.