From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 15 Apr 2023 17:49:50 +0000 (+0200)
Subject: Drop absolute() usage in debian.py
X-Git-Tag: v15~246^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcf8a051775bb9c6ff4f072b2bb68b71b4bd0969;p=thirdparty%2Fmkosi.git

Drop absolute() usage in debian.py

We now make sure paths are absolute when parsing them so no need to
do so anymore in debian.py
---

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index 3dc73f298..a3b00b9d1 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -36,7 +36,7 @@ class DebianInstaller(DistributionInstaller):
             "debootstrap",
             "--variant=minbase",
             "--merged-usr",
-            f"--cache-dir={state.cache.absolute()}",
+            f"--cache-dir={state.cache}",
             f"--components={','.join(repos)}",
         ]
 
@@ -174,15 +174,15 @@ def invoke_apt(
             APT::Install-Recommends "false";
             APT::Get::Assume-Yes "true";
             APT::Get::AutomaticRemove "true";
-            Dir::Cache "{state.cache.absolute()}";
-            Dir::State "{state.workspace.absolute() / "apt"}";
+            Dir::Cache "{state.cache}";
+            Dir::State "{state.workspace / "apt"}";
             Dir::State::status "{state.root / "var/lib/dpkg/status"}";
-            Dir::Etc "{state.root.absolute() / "etc/apt"}";
-            Dir::Log "{state.workspace.absolute() / "apt/log"}";
+            Dir::Etc "{state.root / "etc/apt"}";
+            Dir::Log "{state.workspace / "apt/log"}";
             Dir::Bin::dpkg "dpkg";
             DPkg::Path "{os.environ["PATH"]}";
-            DPkg::Options:: "--root={state.root.absolute()}";
-            DPkg::Options:: "--log={state.workspace.absolute() / "apt/dpkg.log"}";
+            DPkg::Options:: "--root={state.root}";
+            DPkg::Options:: "--log={state.workspace / "apt/dpkg.log"}";
             DPkg::Options:: "--force-unsafe-io";
             DPkg::Install::Recursive::Minimum "1000";
             """