From 9a4006ac166bd9c47c495a9d041efaa5ba943792 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sep 19 2023 05:47:01 +0000 Subject: Assure presence of workdir in RpmBuilder This avoids FileNotFoundError during build-container-local in the case that $arch/rpms exists but $arch/work does not (e.g. it was removed since the last build-rpms-local to save space). --- diff --git a/flatpak_module_tools/rpm_builder.py b/flatpak_module_tools/rpm_builder.py index 05af3c7..2706415 100644 --- a/flatpak_module_tools/rpm_builder.py +++ b/flatpak_module_tools/rpm_builder.py @@ -107,6 +107,7 @@ class RpmBuilder: if include_packages: packages_file = self.workdir / \ f"{self.flatpak_spec.runtime_name}-{self.flatpak_spec.runtime_version}.packages" + self.workdir.mkdir(parents=True, exist_ok=True) with open(packages_file, "w") as f: for pkg in self.context.runtime_packages: print(pkg, file=f) @@ -424,9 +425,6 @@ class RpmBuilder: ): self._refresh_metadata(include_localrepo=False) - # FIXME - probably should use a temporary workdir in this case - self.workdir.mkdir(parents=True, exist_ok=True) - to_build = self._get_rebuild_packages( manual_packages, auto=auto, include_localrepo=False, allow_outdated=allow_outdated ) @@ -454,7 +452,6 @@ class RpmBuilder: ): if self.context.local_repo is None: raise RuntimeError("context.local_repo must be set for build_rpms_local") - self.workdir.mkdir(parents=True, exist_ok=True) self._refresh_metadata()