From 669266dfa2187d1d0d1f2bc512277e0010d13772 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 16 Jan 2025 15:01:18 +0000 Subject: [PATCH] populate-depot: Always generate ./run This was accidentally made conditional on whether we are generating a tool manifest for the Steam compatibility tool framework, which we don't want to do if we are using the container runtime for some other purpose. For example, the container runtime that's used to run `steamwebhelper` doesn't need the tool manifest. Signed-off-by: Simon McVittie <smcv@collabora.com> --- subprojects/container-runtime/populate-depot.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/subprojects/container-runtime/populate-depot.py b/subprojects/container-runtime/populate-depot.py index ee74b5ae1..eb259707a 100755 --- a/subprojects/container-runtime/populate-depot.py +++ b/subprojects/container-runtime/populate-depot.py @@ -1036,6 +1036,12 @@ class Main: os.chmod(os.path.join(self.depot, 'run-in-' + runtime.name), 0o755) + shutil.copy2( + os.path.join(self.depot, 'run-in-' + runtime.name), + os.path.join(self.depot, 'run'), + ) + os.chmod(os.path.join(self.depot, 'run'), 0o755) + comment = ', '.join(sorted(runtime_files)) if runtime.path and not runtime.official: @@ -1105,12 +1111,6 @@ class Main: vdf.dump(content, writer, pretty=True, escaped=True) - shutil.copy2( - os.path.join(self.depot, 'run-in-' + runtime.name), - os.path.join(self.depot, 'run'), - ) - os.chmod(os.path.join(self.depot, 'run'), 0o755) - self.write_component_versions() def write_component_versions(self) -> None: -- GitLab