--- cfengine-2.1.1/src/do.c.orig Tue Jan 20 08:10:05 2004 +++ cfengine-2.1.1/src/do.c Mon Jan 19 20:35:10 2004 @@ -2467,27 +2467,27 @@ ResetOutputRoute(ip->log,ip->inform); - snprintf(VBUFF,bufsize,"%.50s.%.50s",path,destination); /* Unique ID for copy locking */ - - if (!GetLock(ASUniqueName("copy"),CanonifyName(VBUFF),ip->ifelapsed,ip->expireafter,VUQNAME,CFSTARTTIME)) + if (cfstat(path,&statbuf,ip) == -1) { + snprintf(OUTPUT,bufsize*2,"Can't stat %s in copy\n",path); + CfLog(cfinform,OUTPUT,""); + ReleaseCurrentLock(); SILENT = savesilent; ResetOutputRoute('d','d'); continue; } - IMAGEBACKUP = ip->backup; - - if (cfstat(path,&statbuf,ip) == -1) + snprintf(VBUFF,bufsize,"%.50s.%.50s",path,destination); /* Unique ID for copy locking */ + + if (!GetLock(ASUniqueName("copy"),CanonifyName(VBUFF),ip->ifelapsed,ip->expireafter,VUQNAME,CFSTARTTIME)) { - snprintf(OUTPUT,bufsize*2,"Can't stat %s in copy\n",path); - CfLog(cfinform,OUTPUT,""); - ReleaseCurrentLock(); SILENT = savesilent; ResetOutputRoute('d','d'); continue; } + IMAGEBACKUP = ip->backup; + if (strncmp(destination,"home",4) == 0) { HOMECOPY = true; /* Don't send home backups to repository */