Revert legend flag change in Systemd* facts

Fizzadar · Fizzadar · commit e0e715cf45e5 · 2022-03-27T19:56:54.000+01:00
diff --git a/pyinfra/facts/systemd.py b/pyinfra/facts/systemd.py
@@ -55,7 +55,7 @@ def command(self, user_mode=False, machine=None, user_name=None):
             user_name=user_name,
         )
 
-        return '{0} -al --plain --legend=false list-units'.format(fact_cmd)
+        return '{0} -al --plain --no-legend list-units'.format(fact_cmd)
 
     def process(self, output):
         services = {}
@@ -90,7 +90,7 @@ def command(self, user_mode=False, machine=None, user_name=None):
         )
 
         return (
-            '{0} -al --plain --legend=false --state=loaded list-units | '
+            '{0} -al --plain --no-legend --state=loaded list-units | '
             'while read -r UNIT REST; do '
             'STATE=$({0} -P UnitFileState show -- "$UNIT"); '
             'if [ -n "$STATE" ]; then '
diff --git a/tests/facts/systemd.SystemdEnabled/machine_services.json b/tests/facts/systemd.SystemdEnabled/machine_services.json
@@ -1,6 +1,6 @@
 {
     "arg": [false, "testmachine", "testuser"],
-    "command": "systemctl --machine=testuser@testmachine -al --plain --legend=false --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
+    "command": "systemctl --machine=testuser@testmachine -al --plain --no-legend --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
     "requires_command": "systemctl",
     "output": [
         "vboxadd.service enabled",
diff --git a/tests/facts/systemd.SystemdEnabled/root_machine_services.json b/tests/facts/systemd.SystemdEnabled/root_machine_services.json
@@ -1,6 +1,6 @@
 {
     "arg": [false, "testmachine"],
-    "command": "systemctl --machine=testmachine -al --plain --legend=false --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --machine=testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
+    "command": "systemctl --machine=testmachine -al --plain --no-legend --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --machine=testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
     "requires_command": "systemctl",
     "output": [
         "vboxadd.service enabled",
diff --git a/tests/facts/systemd.SystemdEnabled/services.json b/tests/facts/systemd.SystemdEnabled/services.json
@@ -1,6 +1,6 @@
 {
     "requires_command": "systemctl",
-    "command": "systemctl -al --plain --legend=false --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
+    "command": "systemctl -al --plain --no-legend --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
     "output": [
         "vboxadd.service enabled",
         "vgauth.timer enabled",
diff --git a/tests/facts/systemd.SystemdEnabled/user_machine_services.json b/tests/facts/systemd.SystemdEnabled/user_machine_services.json
@@ -1,6 +1,6 @@
 {
     "arg": [true, "testmachine", "testuser"],
-    "command": "systemctl --user --machine=testuser@testmachine -al --plain --legend=false --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --user --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
+    "command": "systemctl --user --machine=testuser@testmachine -al --plain --no-legend --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --user --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
     "requires_command": "systemctl",
     "output": [
         "vboxadd.service enabled",
diff --git a/tests/facts/systemd.SystemdEnabled/user_services.json b/tests/facts/systemd.SystemdEnabled/user_services.json
@@ -1,6 +1,6 @@
 {
     "arg": [true],
-    "command": "systemctl --user -al --plain --legend=false --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --user -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
+    "command": "systemctl --user -al --plain --no-legend --state=loaded list-units | while read -r UNIT REST; do STATE=$(systemctl --user -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",
     "requires_command": "systemctl",
     "output": [
         "vboxadd.service enabled",
diff --git a/tests/facts/systemd.SystemdStatus/machine_services.json b/tests/facts/systemd.SystemdStatus/machine_services.json
@@ -1,6 +1,6 @@
 {
     "arg": [false, "testmachine", "testuser"],
-    "command": "systemctl --machine=testuser@testmachine -al --plain --legend=false list-units",
+    "command": "systemctl --machine=testuser@testmachine -al --plain --no-legend list-units",
     "requires_command": "systemctl",
     "output": [
         "lvm2-activation.service      not-found inactive dead    lvm2-activation.service",
diff --git a/tests/facts/systemd.SystemdStatus/root_machine_services.json b/tests/facts/systemd.SystemdStatus/root_machine_services.json
@@ -1,6 +1,6 @@
 {
     "arg": [false, "testmachine"],
-    "command": "systemctl --machine=testmachine -al --plain --legend=false list-units",
+    "command": "systemctl --machine=testmachine -al --plain --no-legend list-units",
     "requires_command": "systemctl",
     "output": [
         "lvm2-activation.service      not-found inactive dead    lvm2-activation.service",
diff --git a/tests/facts/systemd.SystemdStatus/services.json b/tests/facts/systemd.SystemdStatus/services.json
@@ -1,5 +1,5 @@
 {
-    "command": "systemctl -al --plain --legend=false list-units",
+    "command": "systemctl -al --plain --no-legend list-units",
     "requires_command": "systemctl",
     "output": [
         "lvm2-activation.service      not-found inactive dead    lvm2-activation.service",
diff --git a/tests/facts/systemd.SystemdStatus/user_machine_services.json b/tests/facts/systemd.SystemdStatus/user_machine_services.json
@@ -1,6 +1,6 @@
 {
     "arg": ["True", "testmachine", "testuser"],
-    "command": "systemctl --user --machine=testuser@testmachine -al --plain --legend=false list-units",
+    "command": "systemctl --user --machine=testuser@testmachine -al --plain --no-legend list-units",
     "requires_command": "systemctl",
     "output": [
         "lvm2-activation.service      not-found inactive dead    lvm2-activation.service",
diff --git a/tests/facts/systemd.SystemdStatus/user_services.json b/tests/facts/systemd.SystemdStatus/user_services.json
@@ -1,6 +1,6 @@
 {
     "arg": ["True"],
-    "command": "systemctl --user -al --plain --legend=false list-units",
+    "command": "systemctl --user -al --plain --no-legend list-units",
     "requires_command": "systemctl",
     "output": [
         "lvm2-activation.service      not-found inactive dead    lvm2-activation.service",

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def command(self, user_mode=False, machine=None, user_name=None):`
`55`	`55`	`user_name=user_name,`
`56`	`56`	`)`
`57`	`57`
`58`		`- return '{0} -al --plain --legend=false list-units'.format(fact_cmd)`
	`58`	`+ return '{0} -al --plain --no-legend list-units'.format(fact_cmd)`
`59`	`59`
`60`	`60`	`def process(self, output):`
`61`	`61`	`services = {}`
`@@ -90,7 +90,7 @@ def command(self, user_mode=False, machine=None, user_name=None):`
`90`	`90`	`)`
`91`	`91`
`92`	`92`	`return (`
`93`		`- '{0} -al --plain --legend=false --state=loaded list-units \| '`
	`93`	`+ '{0} -al --plain --no-legend --state=loaded list-units \| '`
`94`	`94`	`'while read -r UNIT REST; do '`
`95`	`95`	`'STATE=$({0} -P UnitFileState show -- "$UNIT"); '`
`96`	`96`	`'if [ -n "$STATE" ]; then '`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"arg": [false, "testmachine", "testuser"],`
`3`		`- "command": "systemctl --machine=testuser@testmachine -al --plain --legend=false --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
	`3`	`+ "command": "systemctl --machine=testuser@testmachine -al --plain --no-legend --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
`4`	`4`	`"requires_command": "systemctl",`
`5`	`5`	`"output": [`
`6`	`6`	`"vboxadd.service enabled",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"arg": [false, "testmachine"],`
`3`		`- "command": "systemctl --machine=testmachine -al --plain --legend=false --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --machine=testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
	`3`	`+ "command": "systemctl --machine=testmachine -al --plain --no-legend --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --machine=testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
`4`	`4`	`"requires_command": "systemctl",`
`5`	`5`	`"output": [`
`6`	`6`	`"vboxadd.service enabled",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"requires_command": "systemctl",`
`3`		`- "command": "systemctl -al --plain --legend=false --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
	`3`	`+ "command": "systemctl -al --plain --no-legend --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
`4`	`4`	`"output": [`
`5`	`5`	`"vboxadd.service enabled",`
`6`	`6`	`"vgauth.timer enabled",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"arg": [true, "testmachine", "testuser"],`
`3`		`- "command": "systemctl --user --machine=testuser@testmachine -al --plain --legend=false --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --user --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
	`3`	`+ "command": "systemctl --user --machine=testuser@testmachine -al --plain --no-legend --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --user --machine=testuser@testmachine -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
`4`	`4`	`"requires_command": "systemctl",`
`5`	`5`	`"output": [`
`6`	`6`	`"vboxadd.service enabled",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"arg": [true],`
`3`		`- "command": "systemctl --user -al --plain --legend=false --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --user -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
	`3`	`+ "command": "systemctl --user -al --plain --no-legend --state=loaded list-units \| while read -r UNIT REST; do STATE=$(systemctl --user -P UnitFileState show -- \"$UNIT\"); if [ -n \"$STATE\" ]; then echo \"$UNIT\" \"$STATE\"; fi; done",`
`4`	`4`	`"requires_command": "systemctl",`
`5`	`5`	`"output": [`
`6`	`6`	`"vboxadd.service enabled",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "command": "systemctl -al --plain --legend=false list-units",`
	`2`	`+ "command": "systemctl -al --plain --no-legend list-units",`
`3`	`3`	`"requires_command": "systemctl",`
`4`	`4`	`"output": [`
`5`	`5`	`"lvm2-activation.service not-found inactive dead lvm2-activation.service",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"arg": ["True", "testmachine", "testuser"],`
`3`		`- "command": "systemctl --user --machine=testuser@testmachine -al --plain --legend=false list-units",`
	`3`	`+ "command": "systemctl --user --machine=testuser@testmachine -al --plain --no-legend list-units",`
`4`	`4`	`"requires_command": "systemctl",`
`5`	`5`	`"output": [`
`6`	`6`	`"lvm2-activation.service not-found inactive dead lvm2-activation.service",`