Changeset 336 in MondoRescue

Timestamp:

Jan 19, 2006, 11:32:46 PM (18 years ago)

Author:

bcornec

Message:

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

Location:

branches/stable

Files:

• mondo/mondo/common/libmondo-filelist.c (modified) (1 diff)
• tools/mkdeliv (modified) (2 diffs)

branches/stable/mondo/mondo/common/libmondo-filelist.c

@@ -1534 +1534 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         sprintf(tmp,
-                "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",
+                "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",
                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         sprintf(tmp,
-                "find %s -maxdepth %d -path /proc -prune -o -path -prune -o -type d -a -print > %s 2> /dev/null",
+                "find %s -maxdepth %d -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
 #endif

branches/stable/tools/mkdeliv

@@ -36 +36 @@
     cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2
     tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}.${suf}.src.rpm"
+    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
+    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
 fi
 if [ "`echo $c | grep  mondo`" != "" ]; then
@@ -43 +43 @@
     cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2
     tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.${suf}.src.rpm"
+    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
+    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
 fi
 echo "Sources delivery to ${BERLIOSAC}:${DSTDIR}/src"