Merge pull request #224 from tmaeno/master

cleanup for debug mode

PandaPkgInfo.py

@@ -1 +1 @@
-release_version = "0.0.59"
+release_version = "0.0.60"

pandaserver/jobdispatcher/Protocol.py

@@ -281,7 +281,7 @@ def appendJob(self, job, siteMapperCache=None):
         if job.is_no_looping_check():
             self.data['loopingCheck'] = False
         # debug mode
-        if job.specialHandling is not None and 'debug' in job.specialHandling:
+        if job.is_debug_mode():
             self.data['debug'] = 'True'
         # event service or job cloning or fine-grained
         if EventServiceUtils.isJobCloningJob(job):

pandaserver/taskbuffer/OraDBProxy.py

@@ -2424,8 +2424,11 @@ def updateJobStatus(self,pandaID,jobStatus,param,updateStateChange=False,attempt
                         lockedby,jediTaskID,jobsetID,jobDispatcherErrorDiag,supErrorCode,eventService,batchID \
                         = res
                     # debug mode
-                    if specialHandling not in [None,''] and 'debug' in specialHandling:
-                        ret += 'debug,'
+                    if specialHandling:
+                        tmpJobSpec = JobSpec()
+                        tmpJobSpec.specialHandling = specialHandling
+                        if tmpJobSpec.is_debug_mode():
+                            ret += 'debug,'
                     # FIXME
                     #else:
                     #    ret += 'debugoff,'