From 77bec8cf5512a152305ebd8d302a77563bbe9664 Mon Sep 17 00:00:00 2001 From: Martin Matous Date: Tue, 29 Mar 2022 16:23:56 +0200 Subject: [PATCH] fix(kernel-update): handle ebuild revisions Signed-off-by: Martin Matous --- kernel-update.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel-update.py b/kernel-update.py index 58603be..6a6175d 100755 --- a/kernel-update.py +++ b/kernel-update.py @@ -7,7 +7,6 @@ import shutil import subprocess import sys -from packaging.version import Version from pathlib import Path from typing import Any, Dict, List, Tuple @@ -100,7 +99,12 @@ def install_kernel(kernel_dir: Path, boot_dir: Path, boot_files: Dict[str, Path] def linux_folder(src_dir: Path, version: str) -> Path: - return (src_dir / (f'linux-{version}-gentoo')) + revision = '' + version = version.split('-') + if len(version) > 1: + revision = '-' + version[1] + version = version[0] + return (src_dir / (f'linux-{version}-gentoo{revision}')) def module_check(boot_dir: Path, boot_files: Dict[str, Path]) -> Tuple[bool, Path]: @@ -172,12 +176,8 @@ def main() -> None: update.add_argument( '--install', '-i', action='store_true', help='Install new kernel') - update.add_argument( - 'old_version', type=Version, - help='Old kernel version') - update.add_argument( - 'new_version', type=Version, - help='New kernel version') + update.add_argument('old_version', help='Old kernel version') + update.add_argument('new_version', help='New kernel version') update.set_defaults(func=update_kernel) args = parser.parse_args()