From 7b65e2624f498a4e74018106856eb24043811f87 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 22 Mar 2016 20:58:08 +0000 Subject: [PATCH] Added another guard against varying pyang output format. - Legacy-Id: 10966 --- ietf/submit/checkers.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py index 4d3bfb150..83c2e25e4 100644 --- a/ietf/submit/checkers.py +++ b/ietf/submit/checkers.py @@ -142,17 +142,21 @@ class DraftYangChecker(object): if code > 0: error_lines = err.splitlines() for line in error_lines: - fn, lnum, msg = line.split(':', 2) - lnum = int(lnum) - if fn == model and (lnum-1) in range(len(text)): - line = text[lnum-1].rstrip() - else: - line = None - items.append((lnum, line, msg)) - if 'error: ' in msg: - errors += 1 - if 'warning: ' in msg: - warnings += 1 + if line.strip(): + try: + fn, lnum, msg = line.split(':', 2) + lnum = int(lnum) + if fn == model and (lnum-1) in range(len(text)): + line = text[lnum-1].rstrip() + else: + line = None + items.append((lnum, line, msg)) + if 'error: ' in msg: + errors += 1 + if 'warning: ' in msg: + warnings += 1 + except ValueError: + pass results[model] = { "passed": code == 0, "message": out+"No validation errors\n" if code == 0 else err,