From 727f2b589e772cd2826ddd4965bb773f65f74a33 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Mon, 25 Apr 2022 11:14:18 +0100 Subject: [PATCH 1/3] Use alternative rather than name toi match manpage --- jc/parsers/update_alt_q.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jc/parsers/update_alt_q.py b/jc/parsers/update_alt_q.py index bbfcbf64..507c929a 100644 --- a/jc/parsers/update_alt_q.py +++ b/jc/parsers/update_alt_q.py @@ -30,7 +30,7 @@ Schema: "value": string, # (null if 'none') "alternatives": [ { - "name": string, + "alternative": string, "priority": integer, "slaves": [ { @@ -63,7 +63,7 @@ Examples: "value": "/bin/nano", "alternatives": [ { - "name": "/bin/ed", + "alternative": "/bin/ed", "priority": -100, "slaves": [ { @@ -73,7 +73,7 @@ Examples: ] }, { - "name": "/bin/nano", + "alternative": "/bin/nano", "priority": 40, "slaves": [ { @@ -104,7 +104,7 @@ Examples: "value": "/bin/nano", "alternatives": [ { - "name": "/bin/ed", + "alternative": "/bin/ed", "priority": "-100", "slaves": [ { @@ -114,7 +114,7 @@ Examples: ] }, { - "name": "/bin/nano", + "alternative": "/bin/nano", "priority": "40", "slaves": [ { @@ -246,7 +246,7 @@ def parse( raw_output['alternatives'].append(alt_obj) slaves = [] - alt_obj = {"name": line_list[1]} + alt_obj = {"alternative": line_list[1]} continue if line.startswith('Priority: '): From d2adc2630c5f95d5418dd72fac52eb0bdff4e249 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Mon, 25 Apr 2022 11:14:18 +0100 Subject: [PATCH 2/3] Use alternative rather than name to match manpage --- jc/parsers/update_alt_q.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jc/parsers/update_alt_q.py b/jc/parsers/update_alt_q.py index bbfcbf64..507c929a 100644 --- a/jc/parsers/update_alt_q.py +++ b/jc/parsers/update_alt_q.py @@ -30,7 +30,7 @@ Schema: "value": string, # (null if 'none') "alternatives": [ { - "name": string, + "alternative": string, "priority": integer, "slaves": [ { @@ -63,7 +63,7 @@ Examples: "value": "/bin/nano", "alternatives": [ { - "name": "/bin/ed", + "alternative": "/bin/ed", "priority": -100, "slaves": [ { @@ -73,7 +73,7 @@ Examples: ] }, { - "name": "/bin/nano", + "alternative": "/bin/nano", "priority": 40, "slaves": [ { @@ -104,7 +104,7 @@ Examples: "value": "/bin/nano", "alternatives": [ { - "name": "/bin/ed", + "alternative": "/bin/ed", "priority": "-100", "slaves": [ { @@ -114,7 +114,7 @@ Examples: ] }, { - "name": "/bin/nano", + "alternative": "/bin/nano", "priority": "40", "slaves": [ { @@ -246,7 +246,7 @@ def parse( raw_output['alternatives'].append(alt_obj) slaves = [] - alt_obj = {"name": line_list[1]} + alt_obj = {"alternative": line_list[1]} continue if line.startswith('Priority: '): From 8bc2ea14a3c83df0c46a16384cffd10f4fa5880b Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Mon, 25 Apr 2022 11:20:36 +0100 Subject: [PATCH 3/3] Whitespace fix --- jc/parsers/update_alt_q.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jc/parsers/update_alt_q.py b/jc/parsers/update_alt_q.py index 507c929a..625e15dd 100644 --- a/jc/parsers/update_alt_q.py +++ b/jc/parsers/update_alt_q.py @@ -30,7 +30,7 @@ Schema: "value": string, # (null if 'none') "alternatives": [ { - "alternative": string, + "alternative": string, "priority": integer, "slaves": [ {