Unverified Commit 55f5a36c authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #13343 from bernt-matthias/topic/univa-wo-nativespec 

[21.09] Allow UNIVA destinations without runtime and memory max given in the nativespec
parents 76a8e12d 87337bad

lib/galaxy/jobs/runners/univa.py

+3 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import logging 
import re

import signal

import time

from math import inf



from galaxy.jobs.runners.drmaa import DRMAAJobRunner

from galaxy.util import (
@@ -566,8 +567,8 @@ def _parse_native_specs(job_id, native_spec): 
    specification string passed to GE

    return time,mem (or None,None if nothing found)

    """

    tme = None

    mem = None

    tme = inf

    mem = inf

    # parse time

    m = re.search(r"rt=([0-9:]+)[\s,]*", native_spec)

    if m is not None: