mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-28 02:58:18 +08:00
fix bug introduced in https://github.com/galaxyproject/galaxy/pull/9246
This commit is contained in:
@@ -2092,7 +2092,7 @@ class JobWrapper(HasResourceParameters):
|
||||
log.debug('(%s) Changing ownership of working directory with: %s' % (job.id, ' '.join(cmd)))
|
||||
p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
stdout, stderr = p.communicate()
|
||||
stdout, stderr = unicodify(stdout).strip(), unicodify(stdout).strip()
|
||||
stdout, stderr = unicodify(stdout).strip(), unicodify(stderr).strip()
|
||||
if p.returncode != 0:
|
||||
log.error('external script failed.')
|
||||
log.error('stdout was: %s' % stdout)
|
||||
|
||||
@@ -31,7 +31,11 @@ import subprocess
|
||||
import time
|
||||
|
||||
from galaxy.jobs.runners.drmaa import DRMAAJobRunner
|
||||
from galaxy.util import size_to_bytes, unicodify
|
||||
from galaxy.util import (
|
||||
size_to_bytes,
|
||||
unicodify
|
||||
)
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
__all__ = ('UnivaJobRunner',)
|
||||
|
||||
Reference in New Issue
Block a user