[PATCH] python/sepolicy: Fix get_os_version except clause

[PATCH] python/sepolicy: Fix get_os_version except clause

[Jeffery To]

This adds more exceptions to be handled by the except clause in
`get_os_version()`:

* If the `distro` package is not installed, then `import distro` raises
  a `ModuleNotFoundError` exception.

* The distro documentation[1] lists `OSError` and `UnicodeError` as
  exceptions that can be raised.

* Older versions of distro (<= 1.6.0) may also raise
  `subprocessCalledProcessError`[2].

[1]: https://github.com/python-distro/distro/blob/v1.8.0/src/distro/distro.py#L749-L753
[2]: https://github.com/python-distro/distro/blob/v1.6.0/distro.py#L726-L728

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
 python/sepolicy/sepolicy/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
index c177cdfc529d..2d526c94a0c5 100644
--- a/python/sepolicy/sepolicy/__init__.py
+++ b/python/sepolicy/sepolicy/__init__.py
@@ -1240,11 +1240,12 @@ def boolean_desc(boolean):
 
 
 def get_os_version():
+    import subprocess
     system_release = ""
     try:
         import distro
         system_release = distro.name(pretty=True)
-    except IOError:
+    except (ModuleNotFoundError, OSError, IOError, UnicodeError, subprocess.CalledProcessError):
         system_release = "Misc"
 
     return system_release
-- 
2.39.2

Re: [PATCH] python/sepolicy: Fix get_os_version except clause

[Petr Lautrbach]

Jeffery To <jeffery.to@gmail.com> writes:

> This adds more exceptions to be handled by the except clause in
> `get_os_version()`:
>
> * If the `distro` package is not installed, then `import distro` raises
>   a `ModuleNotFoundError` exception.
>
> * The distro documentation[1] lists `OSError` and `UnicodeError` as
>   exceptions that can be raised.
>
> * Older versions of distro (<= 1.6.0) may also raise
>   `subprocessCalledProcessError`[2].
>
> [1]: https://github.com/python-distro/distro/blob/v1.8.0/src/distro/distro.py#L749-L753
> [2]: https://github.com/python-distro/distro/blob/v1.6.0/distro.py#L726-L728
>
> Signed-off-by: Jeffery To <jeffery.to@gmail.com>

Acked-by: Petr Lautrbach <lautrbach@redhat.com>

> ---
>  python/sepolicy/sepolicy/__init__.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
> index c177cdfc529d..2d526c94a0c5 100644
> --- a/python/sepolicy/sepolicy/__init__.py
> +++ b/python/sepolicy/sepolicy/__init__.py
> @@ -1240,11 +1240,12 @@ def boolean_desc(boolean):
>  
>  
>  def get_os_version():
> +    import subprocess
>      system_release = ""
>      try:
>          import distro
>          system_release = distro.name(pretty=True)
> -    except IOError:
> +    except (ModuleNotFoundError, OSError, IOError, UnicodeError, subprocess.CalledProcessError):
>          system_release = "Misc"
>  
>      return system_release
> -- 
> 2.39.2

Re: [PATCH] python/sepolicy: Fix get_os_version except clause

[Petr Lautrbach]

Petr Lautrbach <lautrbach@redhat.com> writes:

> Jeffery To <jeffery.to@gmail.com> writes:
>
>> This adds more exceptions to be handled by the except clause in
>> `get_os_version()`:
>>
>> * If the `distro` package is not installed, then `import distro` raises
>>   a `ModuleNotFoundError` exception.
>>
>> * The distro documentation[1] lists `OSError` and `UnicodeError` as
>>   exceptions that can be raised.
>>
>> * Older versions of distro (<= 1.6.0) may also raise
>>   `subprocessCalledProcessError`[2].
>>
>> [1]: https://github.com/python-distro/distro/blob/v1.8.0/src/distro/distro.py#L749-L753
>> [2]: https://github.com/python-distro/distro/blob/v1.6.0/distro.py#L726-L728
>>
>> Signed-off-by: Jeffery To <jeffery.to@gmail.com>
>
> Acked-by: Petr Lautrbach <lautrbach@redhat.com>

merged, thanks!


>> ---
>>  python/sepolicy/sepolicy/__init__.py | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
>> index c177cdfc529d..2d526c94a0c5 100644
>> --- a/python/sepolicy/sepolicy/__init__.py
>> +++ b/python/sepolicy/sepolicy/__init__.py
>> @@ -1240,11 +1240,12 @@ def boolean_desc(boolean):
>>  
>>  
>>  def get_os_version():
>> +    import subprocess
>>      system_release = ""
>>      try:
>>          import distro
>>          system_release = distro.name(pretty=True)
>> -    except IOError:
>> +    except (ModuleNotFoundError, OSError, IOError, UnicodeError, subprocess.CalledProcessError):
>>          system_release = "Misc"
>>  
>>      return system_release
>> -- 
>> 2.39.2