Skip to content

Commit

Permalink
Merge remote-tracking branch 'richtja/packaging_import_fix'
Browse files Browse the repository at this point in the history
Signed-off-by: Cleber Rosa <[email protected]>
  • Loading branch information
clebergnu committed Aug 26, 2024
2 parents 6097f08 + 58738b6 commit 20053f6
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions avocado/utils/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
import shutil
import tempfile

from packaging.version import parse
try:
import packaging
except ImportError:
from pkg_resources import packaging

from avocado.utils import archive, asset, build, distro, process

Expand Down Expand Up @@ -207,6 +210,6 @@ def check_version(version):
:type version: string
:param version: version to be compared with current kernel version
"""
os_version = parse(os.uname()[2])
version = parse(version)
os_version = packaging.version.parse(os.uname()[2])
version = packaging.version.parse(version)
assert os_version > version, "Old kernel"

0 comments on commit 20053f6

Please sign in to comment.