summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur3
-rw-r--r--usr.sbin/ctm/mkCTM/ctm_conf.gnats2
-rw-r--r--usr.sbin/ctm/mkCTM/ctm_conf.ports-cur3
-rw-r--r--usr.sbin/ctm/mkCTM/ctm_conf.smp-cur3
-rw-r--r--usr.sbin/ctm/mkCTM/ctm_conf.src-cur3
-rw-r--r--usr.sbin/ctm/mkCTM/mkCTM2
6 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
index f6489ad..fbb5bf2 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
@@ -2,7 +2,8 @@
set CTMname cvs-cur
set CTMref /home/ncvs
-set CTMdont {\.core$|^/CVSROOT/history.*$|^/src/secure|^/src/eBones|^/src/kerberosIV|/#cvs|/\.#|^/CVSROOT/val-tags$}
+set CTMignore {^src/secure|^src/eBones|^src/kerberosIV|^CVSROOT/val-tags$|CVSROOT/\\.#}
+set CTMbogus {\\.core$|/#cvs|/\\.#}
set CTMmail ctm-cvs-cur-fast@freebsd.org
set CTMqueuemail ctm-cvs-cur@freebsd.org
set CTMqueue /home/ctm/queue/ctm-cvs-cur
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.gnats b/usr.sbin/ctm/mkCTM/ctm_conf.gnats
index bbd41eb..c2223f0 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.gnats
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.gnats
@@ -4,5 +4,5 @@
set CTMname gnats
set CTMref /home/gnats
set CTMdest $CTMSW/../CTM-pub/$CTMname
-set CTMignore {\.lock$}
+set CTMignore {\\.lock$}
set CTMmail ctm-gnats@freebsd.org
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.ports-cur b/usr.sbin/ctm/mkCTM/ctm_conf.ports-cur
index ccfe94f..b9d3d13 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.ports-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.ports-cur
@@ -2,5 +2,6 @@
set CTMname ports-cur
set CTMref /usr/ports
-set CTMdont {\.core$|/CVS$|/CVS/|^/distfiles|/#cvs|/\.#}
+set CTMignore {/CVS$|/CVS/|^distfiles}
+set CTMbogus {\\.core$|/#cvs|/\\.#}
set CTMmail ctm-ports-cur@freebsd.org
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur b/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur
index 19ac603..5c3e1d1 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur
@@ -2,5 +2,6 @@
set CTMname smp-cur
set CTMref /home/smp
-set CTMdont {\.core$|^/CVSROOT/history.*$|/#cvs|/\.#|^/CVSROOT/val-tags$}
+set CTMignore {^CVSROOT/history.*$|^CVSROOT/val-tags$|^CVSROOT/\\.#}
+set CTMbogus {\\.core$|/#cvs|/\\.#}
set CTMmail smp-cvs-cur@freebsd.org
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
index df9bba7..8589d04 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
@@ -2,7 +2,8 @@
set CTMname src-cur
set CTMref /c/src
-set CTMdont {\.core$|/CVS$|/CVS/|^/secure|^/eBones|/#cvs|/\.#}
+set CTMignore {/CVS$|/CVS/|^/secure|^/eBones}
+set CTMbogus {\\.core$|/#cvs|/\\.#}
set CTMmail ctm-src-cur-fast@freebsd.org
set CTMqueue /home/ctm/queue/ctm-src-cur
set CTMqueuemail ctm-src-cur@freebsd.org
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index 537d17c..684fb6a 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -113,7 +113,7 @@ while 1 {
exec mkdir ${CTMtmp}.dir
set x1 ${CTMtmp}.dir
}
- set r1 [catch "exec ${CTMSW}/mkctm -I ${CTMignore} -B ${CTMbogus} -l ${CTMtmp}.log -D $max_damage $CTMname $CTMnbr . $CTMdate $x1 $CTMref | md5 -p | gzip -9 > ${CTMtmp}:${nm}.gz 2>@ stderr" r2]
+ set r1 [catch "exec ${CTMSW}/mkctm -I ${CTMignore} -B ${CTMbogus} -l ${CTMtmp}.log -D $max_damage $CTMname $CTMnbr $CTMdate . $x1 $CTMref | md5 -p | gzip -9 > ${CTMtmp}:${nm}.gz 2>@ stderr" r2]
if {$r1} {
if {[lindex $errorCode 2] == 4} {
OpenPOWER on IntegriCloud