]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkctl: use "-" for empty fields
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 20 Sep 2022 18:41:31 +0000 (20:41 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 21 Sep 2022 12:48:28 +0000 (14:48 +0200)
This looks nicer. Some fields were already using "-" as fallback, e.g. Speed,
so this makes things more consistent too.

src/network/networkctl.c
test/test-network/systemd-networkd-tests.py

index c489ccbf4e1ff2808c767f0177b84dcb6779f224..f69cde7e4deb9de3e4189718f89cede498408567 100644 (file)
@@ -817,7 +817,7 @@ static int list_links(int argc, char *argv[], void *userdata) {
                 table_set_width(table, 0);
 
         table_set_header(table, arg_legend);
-        if (table_set_empty_string(table, "n/a") < 0)
+        if (table_set_empty_string(table, "-") < 0)
                 return log_oom();
 
         assert_se(cell = table_get_cell(table, 0, 0));
index 2f638d158a6e602cea1b7be2bd761eeb93248607..b90a07e22bd9bf5b6ba52cdd8f9e9b06adf4a7d5 100755 (executable)
@@ -1047,8 +1047,8 @@ class NetworkctlTests(unittest.TestCase, Utilities):
 
         output = check_output(*networkctl_cmd, '-n', '0', 'status', 'lo', env=env)
         print(output)
-        self.assertRegex(output, r'Link File: n/a')
-        self.assertRegex(output, r'Network File: n/a')
+        self.assertRegex(output, r'Link File: -')
+        self.assertRegex(output, r'Network File: -')
 
     def test_delete_links(self):
         copy_network_unit('11-dummy.netdev', '11-dummy.network',