From f72416180988758417777bd3051e1a67c4a96f15 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Wed, 29 Oct 2025 21:03:57 -0600
Subject: [PATCH 1/2] Fix argument list too long error

---
 pyproject.toml    |  2 +-
 toltec/builder.py | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 31c36ec..4b05c38 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "toltecmk"
-version = "0.5.1"
+version = "0.5.2"
 authors = [
   { name="Mattéo Delabre", email="git.matteo@delab.re" },
   { name="Eeems", email="eeems@eeems.email" },
diff --git a/toltec/builder.py b/toltec/builder.py
index ddad507..d45da78 100644
--- a/toltec/builder.py
+++ b/toltec/builder.py
@@ -7,9 +7,9 @@
 from types import TracebackType
 import re
 import os
-import shlex
 import logging
 import textwrap
+from inspect import getsource
 from importlib.util import find_spec, module_from_spec
 import docker
 import requests
@@ -405,19 +405,17 @@ def _build(self, recipe: Recipe, src_dir: str) -> None:
         repo_src = "/repo"
         uid = os.getuid()
         gid = os.getgid()
-        restore_script: list[str] = []
 
         # Set fixed atime and mtime for all the source files
         epoch = int(recipe.timestamp.timestamp())
-        for file_path in util.list_tree(src_dir):
-            docker_path = shlex.quote(
-                os.path.join(mount_src, os.path.relpath(file_path, src_dir))
-            )
-            restore_script.append(
-                'echo "import os; os.utime('
-                + f'\\"{docker_path}\\", ns=({epoch}, {epoch})'
-                + ')" | python3 -u'
-            )
+        restore_script: list[str] = [
+            "python3 -u <<EOF",
+            "import os",
+            getsource(util.list_tree),
+            f'for file_path in util.list_tree("{mount_src}")',
+            f"    os.utime(file_path, ns=({epoch}, {epoch})",
+            "EOF",
+        ]
 
         logs = self._run_script(
             [

From 93451fbd5c714d7bd0606c89f9a8f891b172d49b Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Wed, 29 Oct 2025 21:08:08 -0600
Subject: [PATCH 2/2] Fix test

---
 toltec/builder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toltec/builder.py b/toltec/builder.py
index d45da78..78ef117 100644
--- a/toltec/builder.py
+++ b/toltec/builder.py
@@ -412,8 +412,8 @@ def _build(self, recipe: Recipe, src_dir: str) -> None:
             "python3 -u <<EOF",
             "import os",
             getsource(util.list_tree),
-            f'for file_path in util.list_tree("{mount_src}")',
-            f"    os.utime(file_path, ns=({epoch}, {epoch})",
+            f'for file_path in list_tree("{mount_src}"):',
+            f"    os.utime(file_path, ns=({epoch}, {epoch}))",
             "EOF",
         ]