--- windmill-0.9.15.orig/src/supervise.py	2004-09-07 19:56:18.000000000 +0200
+++ windmill-0.9.15/src/supervise.py	2004-11-03 08:03:48.000000000 +0100
@@ -209,7 +209,7 @@
                         self._exedata.append([ids[item]])
                   self._jobstarted += 1
                else:
-                  self._db.tagVerified(str(ids[2]), str(ids[0]), None, 0)
+                  self._db.tagUnreserve(ids[0])
          elif status == "failed" or status == "rejected":
             self._db.tagUnreserve(ids[0])
          # clean up if no more action needed on this job
@@ -401,22 +401,22 @@
                   if outerror:
                      if validationDiagnostic:
                         validationDiagnostic += outerror
-                        jobexeid = self._db.getJobExeid(ids[0], ids[2])
-                        if jobexeid:
-                           self._db.tagDQRename(str(jobexeid), 
-                                                validationDiagnostic)
                      else:
                         validationDiagnostic = outerror[1:]
-               else:
-                  # how did this happen - play safe just in case
-                  if validationDiagnostic:
-                     validationDiagnostic += ' renameError noAttempt'
                      jobexeid = self._db.getJobExeid(ids[0], ids[2])
                      if jobexeid:
                         self._db.tagDQRename(str(jobexeid), 
                                              validationDiagnostic)
+               else:
+                  # how did this happen - play safe just in case
+                  if validationDiagnostic:
+                     validationDiagnostic += ' renameError noAttempt'
                   else:
                      validationDiagnostic = 'renameError noAttempt'
+                  jobexeid = self._db.getJobExeid(ids[0], ids[2])
+                  if jobexeid:
+                     self._db.tagDQRename(str(jobexeid), 
+                                          validationDiagnostic)
          if status == "finished" or status == "failed":
             # update database
             row += [validationDiagnostic]