Fix unlink

[tclrobot.git] / robot.tcl

diff --git a/robot.tcl b/robot.tcl
index c79b410..93604a8 100755 (executable)
--- a/robot.tcl
+++ b/robot.tcl
@@ -1,5 +1,5 @@
 #!/usr/bin/tclsh 
-# $Id: robot.tcl,v 1.37 2003/06/10 12:08:17 adam Exp $
+# $Id: robot.tcl,v 1.40 2003/06/10 12:46:04 adam Exp $
 #
 proc RobotFileNext1 {area lead} {
     # puts "RobotFileNext1 area=$area lead=$lead"
@@ -131,7 +131,7 @@ proc RobotFileUnlink {task area host path} {
     for {set i $l} {$i > 0} {incr i -1} {
         set path [join [lrange $comp 0 $i] /]
        if {![catch {glob $path/*}]} return
-        exec rmdir ./$path
+        exec rmdir $path
     }
     # puts "RobotFileUnlink end"
 }
@@ -225,8 +225,10 @@ proc RobotStartJob {fname t} {
     set f [open $fname r]
     set xml [read $f]
     puts "Reading $fname"
-    regexp {<status>([^<]*)</status>} $xml x status
     close $f
+    if {![regexp {<status>([^<]*)</status>} $xml x status]} {
+       return
+    }
     if {$status == "done"} {
         puts "already done"
         return
@@ -1106,6 +1108,10 @@ proc checkrule {task type this} {
                 return 0
             }
         }
+       if {$debuglevel > 3} {
+           puts "CHECKFULE MATCH FAIL"
+       }
+       return 0
     }
     if {$debuglevel > 3} {
         puts "CHECKRULE MATCH OK"