commit/galaxy-central: natefoo: Merge stable.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e057f2263f4b/ Changeset: e057f2263f4b User: natefoo Date: 2013-11-15 20:19:09 Summary: Merge stable. Affected #: 1 file diff -r 74202eb63f37ad49e413c7bcda9d54be881469b9 -r e057f2263f4bf8d2f5c277ae09360e36aa96cbbb lib/galaxy/jobs/runners/pbs.py --- a/lib/galaxy/jobs/runners/pbs.py +++ b/lib/galaxy/jobs/runners/pbs.py @@ -49,7 +49,7 @@ """ PBS_ARGMAP = { - 'destination' : '-d', + 'destination' : '-q', 'Execution_Time' : '-a', 'Account_Name' : '-A', 'Checkpoint' : '-c', @@ -213,6 +213,8 @@ pbs_queue_name = None pbs_server_name = self.default_pbs_server pbs_options = [] + if '-q' in job_destination.params and 'destination' not in job_destination.params: + job_destination.params['destination'] = job_destination.params.pop('-q') if 'destination' in job_destination.params: if '@' in job_destination.params['destination']: # Destination includes a server Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org