mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

Fix the return value of utils._execute_subprocess

Browse Source 
If the output of the subprocess is empty, then an empty <bytes> object
is returned (b''), and not decoded into an empty <string> object.
This may result in errors such as:
    info[109734]: executing /bin/ip -6 addr show eth0
    networking[109734]: error: eth0: cannot use a string pattern on a
        bytes-like object
    error[109734]: eth0: cannot use a string pattern on a bytes-like object
This commit is contained in:
Tal Berlowitz
2022-07-06 18:08:13 +03:00
parent 605d6e0962
commit eee38e73c3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ifupdown2/ifupdown/utils.py
View File

@ -386,7 +386,7 @@ class utils():
finally:
utils.disable_subprocess_signal_forwarding(signal.SIGINT)
cmd_output_string = cmd_output.decode() if cmd_output else cmd_output
cmd_output_string = cmd_output.decode() if cmd_output is not None else cmd_output
if cmd_returncode != 0:
raise Exception(cls._format_error(cmd,