Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
fslpy
Commits
4866ec80
Commit
4866ec80
authored
5 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
BF: fix wait for single jobid string, make info ignore non-conformant lines
parent
38411970
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fsl/utils/fslsub.py
+4
-3
4 additions, 3 deletions
fsl/utils/fslsub.py
with
4 additions
and
3 deletions
fsl/utils/fslsub.py
+
4
−
3
View file @
4866ec80
...
...
@@ -160,8 +160,9 @@ def info(job_id):
return
{}
res
=
{}
for
line
in
result
.
splitlines
()[
1
:]:
key
,
value
=
line
.
split
(
'
:
'
,
1
)
res
[
key
.
strip
()]
=
value
.
strip
()
kv
=
line
.
split
(
'
:
'
,
1
)
if
len
(
kv
)
==
2
:
res
[
kv
[
0
].
strip
()]
=
kv
[
1
].
strip
()
return
res
...
...
@@ -208,7 +209,7 @@ def wait(job_ids):
before continuing
"""
start_time
=
time
.
time
()
for
job_id
in
_flatten_job_ids
(
job_ids
):
for
job_id
in
_flatten_job_ids
(
job_ids
)
.
split
(
'
,
'
)
:
log
.
debug
(
'
Waiting for job {}
'
.
format
(
job_id
))
while
len
(
info
(
job_id
))
>
0
:
wait_time
=
min
(
max
(
1
,
(
time
.
time
()
-
start_time
)
/
3.
),
20
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment