Remove dead code

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 73e9bb84aaf267efc15156889b9a1bbded3d480e..f6b0845e5accbd788de93ac2a3549bf3ebe229de 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3,7 +3,6 @@
 import base64
 import contextlib
 import crypt
-import dataclasses
 import datetime
 import errno
 import hashlib
@@ -51,7 +50,6 @@ from mkosi.util import (
     format_rlimit,
     patch_file,
     prepend_to_environ_path,
-    set_umask,
     tmp_dir,
 )
 
@@ -83,11 +81,6 @@ def format_bytes(num_bytes: int) -> str:
     return f"{num_bytes}B"
 
 
-def btrfs_subvol_create(path: Path, mode: int = 0o755) -> None:
-    with set_umask(~mode & 0o7777):
-        run(["btrfs", "subvol", "create", path])
-
-
 @contextlib.contextmanager
 def mount_image(state: MkosiState) -> Iterator[None]:
     with complete_step("Mounting image…", "Unmounting image…"), contextlib.ExitStack() as stack:
@@ -163,17 +156,6 @@ def clean_yum_metadata(root: Path, always: bool) -> None:
     clean_paths(root, paths, tool='/bin/yum', always=always)
 
 
-def clean_zypper_metadata(root: Path, always: bool) -> None:
-    """Remove zypper metadata if /usr/bin/zypper is not present in the image"""
-    paths = [
-        "/var/lib/zypp",
-        "/var/log/zypp",
-        "/var/cache/zypp",
-    ]
-
-    clean_paths(root, paths, tool='/usr/bin/zypper', always=always)
-
-
 def clean_rpm_metadata(root: Path, always: bool) -> None:
     """Remove rpm metadata if /bin/rpm is not present in the image"""
     paths = [
@@ -236,8 +218,6 @@ def clean_package_manager_metadata(state: MkosiState) -> None:
     clean_apt_metadata(state.root, always=always)
     clean_dpkg_metadata(state.root, always=always)
     clean_pacman_metadata(state.root, always=always)
-    clean_zypper_metadata(state.root, always=always)
-    # FIXME: implement cleanup for other package managers: swupd
 
 
 def remove_files(state: MkosiState) -> None:
@@ -518,11 +498,6 @@ def install_base_trees(state: MkosiState) -> None:
             else:
                 die(f"Unsupported base tree source {path}")
 
-            if path.is_dir():
-                copy_path(path, state.root)
-            else:
-                shutil.unpack_archive(path, state.root)
-
 
 def install_skeleton_trees(state: MkosiState) -> None:
     if not state.config.skeleton_trees:
@@ -1637,7 +1612,6 @@ def build_stuff(uid: int, gid: int, args: MkosiArgs, config: MkosiConfig) -> Non
                 save_cache(state)
 
         with complete_step("Building image"):
-            state = dataclasses.replace(state, )
             build_image(state, manifest=manifest, for_cache=False)
 
         maybe_compress(state,

diff --git a/mkosi/util.py b/mkosi/util.py
index 0f6b8a5153c30f1b792cf886323d555437da65e1..9b047bb14e273744c72f04474656bd70876f890d 100644 (file)
--- a/mkosi/util.py
+++ b/mkosi/util.py
@@ -20,15 +20,6 @@ T = TypeVar("T")
 V = TypeVar("V")
 
 
-@contextlib.contextmanager
-def set_umask(mask: int) -> Iterator[int]:
-    old = os.umask(mask)
-    try:
-        yield old
-    finally:
-        os.umask(old)
-
-
 class PackageType(enum.Enum):
     rpm = 1
     deb = 2

diff --git a/tests/test_util.py b/tests/test_util.py
index c8da2dbbd295c27f840ba7b07618be40153ab4fe..758978b9aec938d649d571f9a34e739be0a63871 100644 (file)
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,12 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-import os
-
 from mkosi.util import (
     Compression,
     Distribution,
     PackageType,
-    set_umask,
 )
 
 def test_distribution() -> None:
@@ -16,18 +13,6 @@ def test_distribution() -> None:
     assert str(Distribution.fedora) == "fedora"
 
 
-def test_set_umask() -> None:
-    with set_umask(0o767):
-        tmp1 = os.umask(0o777)
-        with set_umask(0o757):
-            tmp2 = os.umask(0o727)
-        tmp3 = os.umask(0o727)
-
-    assert tmp1 == 0o767
-    assert tmp2 == 0o757
-    assert tmp3 == 0o777
-
-
 def test_compression_enum_creation() -> None:
     assert Compression(None) == Compression.none
     assert Compression("zst") == Compression.zst