Skip to content

Commit 61bae17

Browse files
committed
Prevent unnecessary ACE processing error message
Fixes #148
1 parent 850271f commit 61bae17

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased][unreleased]
44

5+
### Fixed
6+
7+
* ACE interface no longer gives unnecessary error message when reading the run
8+
info from the first line of output (#148)
59

610
## [v0.7.1][]
711

delphin/interfaces/ace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def _result_lines(self, termini=None):
182182
# The 'run' note should appear when the process is opened, but
183183
# handle it here to avoid potential deadlocks if it gets buffered
184184
elif s.startswith('NOTE: tsdb run:'):
185-
self._read_run_info(s)
185+
self._read_run_info(s.rstrip())
186186
# the rest should be normal result lines
187187
else:
188188
lines.append(s.rstrip())
@@ -517,10 +517,10 @@ def _make_response(lines, run):
517517
def _sexpr_data(line):
518518
while line:
519519
expr = SExpr.parse(line)
520-
line = expr.remainder
521520
if len(expr.data) != 2:
522521
logging.error('Malformed output from ACE: {}'.format(line))
523522
break
523+
line = expr.remainder
524524
yield expr.data
525525

526526

0 commit comments

Comments
 (0)