From 1f0ebbe2f6cbc4b8e44af88b2efac2e3eedcf423 Mon Sep 17 00:00:00 2001 From: Chulwoo Shin Date: Mon, 24 Apr 2017 16:57:32 +0900 Subject: [PATCH] [TIC-Core] Fix: handle error when parsing invalid __KS_URL__ Change-Id: I8eb8446f56375acf1d20e711d95b215ace6d1f43 Signed-off-by: Chulwoo Shin --- tic/parser/view_parser.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tic/parser/view_parser.py b/tic/parser/view_parser.py index 73ef588..c227622 100644 --- a/tic/parser/view_parser.py +++ b/tic/parser/view_parser.py @@ -130,6 +130,7 @@ def make_view_data(pkg_group): # e.g., Convert http://a.com/a/ to https://a.com/a/blahblah.ks # Works for file-indexing html if ksURL[-3:].lower() != ".ks": + m = None error = 0 if ksURL[-1:] != "/": ksURL += "/" @@ -138,17 +139,17 @@ def make_view_data(pkg_group): m = re.search('>([^<]*\\.ks)\\s*<', r.text) else: error = 1 - if error == 0 and not m.group(1): + if error == 0 and not m: m = re.search('"([^"]*\\.ks)\\s*"', r.text) - if not m.group(1): + if not m: m = re.search("'([^']*\\.ks)\\s*'", r.text) - if not m.group(1): + if not m: error = 1 if error == 1: node['icon'] = 'glyphicon glyphicon-remove-sign' node['tooltip'] = 'Cannot find image base from' + ksURL return node - ksURL += m.group(1) + ksURL += m.group(0) node['tooltip'] = 'Image base from '+ksURL node['ks'] = ksURL elif desc[0:10] == '__EXPAND__': -- 2.7.4