Add the "upload" job state to prevent job runner from grabbing upload

jobs when tracking in the database.

lib/galaxy/model/__init__.py

@@ -46,6 +46,7 @@ class Job( object ):
     parameters, and output datasets.
     """
     states = Bunch( NEW = 'new',
+                    UPLOAD = 'upload',
                     WAITING = 'waiting',
                     QUEUED = 'queued',
                     RUNNING = 'running',

lib/galaxy/tools/actions/upload.py

@@ -38,6 +38,7 @@ class UploadToolAction( object ):
             job.tool_version = tool.version
         except:
             job.tool_version = "1.0.0"
+        job.state = trans.app.model.Job.states.UPLOAD
         job.flush()
         log.info( 'tool %s created job id %d' % ( tool.id, job.id ) )
         trans.log_event( 'created job id %d' % job.id, tool_id=tool.id )