From ca73076b565bb91995fc804a91b1d8f0424fda05 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Mon, 31 Mar 2025 14:29:27 -0700 Subject: [PATCH] make empty mountpoints list instead of null --- jc/parsers/lsblk.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jc/parsers/lsblk.py b/jc/parsers/lsblk.py index 58713710..e082e89a 100644 --- a/jc/parsers/lsblk.py +++ b/jc/parsers/lsblk.py @@ -26,7 +26,7 @@ Schema: "type": string, "mountpoint": string, "mountpoints": [ - string # null if no mountpoints + string ], "kname": string, "fstype": string, @@ -380,8 +380,11 @@ def parse(data, raw=False, quiet=False): # find multiple mount points and add to a single entry for entry in raw_output: if entry['name']: - if 'mountpoints' in entry and entry['mountpoints']: - entry['mountpoints'] = [entry['mountpoints']] + if 'mountpoints' in entry: + if entry['mountpoints']: + entry['mountpoints'] = [entry['mountpoints']] + else: + entry['mountpoints'] = [] new_list.append(entry) elif 'mountpoints' in entry and entry['mountpoints']: new_list[-1]['mountpoints'].append(entry['mountpoints'])