From caf7e9f69a22f3c9b3d4624fd2238d6e54d932ac Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Wed, 5 Feb 2020 15:11:51 -0800 Subject: [PATCH] fix line clobbering bug and add user field to shortcuts --- jc/parsers/crontab_u.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jc/parsers/crontab_u.py b/jc/parsers/crontab_u.py index 41ad2b5f..c11a1049 100644 --- a/jc/parsers/crontab_u.py +++ b/jc/parsers/crontab_u.py @@ -249,8 +249,10 @@ def parse(data, raw=False, quiet=False): if line.strip().startswith('@'): shortcut_line = cleandata.pop(i) occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@') - cmd = shortcut_line.split(maxsplit=1)[1].strip() + usr = shortcut_line.split(maxsplit=2)[1].strip() + cmd = shortcut_line.split(maxsplit=2)[2].strip() shortcut_list.append({'occurrence': occurrence, + 'user': usr, 'command': cmd}) # Add header row for parsing @@ -259,7 +261,7 @@ def parse(data, raw=False, quiet=False): if len(cleandata) > 1: cron_list = jc.parsers.universal.simple_table_parse(cleandata) - raw_output['schedule'] = cron_list + raw_output['schedule'] = cron_list # Add shortcut entries back in for item in shortcut_list: