From 84b859b342fa027b42cdcf1700b555a86e89a2a0 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Thu, 2 Jul 2020 19:17:35 +0200 Subject: [PATCH] scripts/logview: Few fixups for python3 compatibility Signed-off-by: Francois Andrieu --- scripts/logview | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/logview b/scripts/logview index 5691866d5b..bd79c35e72 100755 --- a/scripts/logview +++ b/scripts/logview @@ -12,7 +12,7 @@ search_terms=['CHANGED','FAILED'] def date_cheat(datestr): dc = subprocess.Popen(['date', '-d', datestr, '+%Y/%m/%d'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] - dc = dc.strip() + dc = dc.strip().decode() return dc @@ -95,9 +95,9 @@ def search_logs(opts, logfiles): def main(args): opts,args = parse_args(args) - for pb in glob.glob(logpath + '/' + opts.playbook): + for pb in glob.glob(os.path.join(logpath,opts.playbook)): pb_name = os.path.basename(pb) - for pb_logdir in glob.glob(pb + '/' + opts.datestr): + for pb_logdir in glob.glob(os.path.join(pb, opts.datestr)): if opts.list_pb: print(pb_name) continue