diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01988de..ce98f07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,6 +123,7 @@ jobs: macOS: name: "macOS (${{ matrix.arch }})" runs-on: ${{ matrix.runner }} + needs: download-tessdata strategy: matrix: include: diff --git a/dangerzone/isolation_provider/base.py b/dangerzone/isolation_provider/base.py index d5816a8..ae28999 100644 --- a/dangerzone/isolation_provider/base.py +++ b/dangerzone/isolation_provider/base.py @@ -340,8 +340,8 @@ class IsolationProvider(ABC): assert p.stderr debug_log = read_debug_text(p.stderr, MAX_CONVERSION_LOG_CHARS) log.info( - "Conversion output (doc to pixels)\n" - f"{DOC_TO_PIXELS_LOG_START}\n" - f"{debug_log}" # no need for an extra newline here - f"{DOC_TO_PIXELS_LOG_END}" + "Conversion output (doc to pixels)\n" + f"{DOC_TO_PIXELS_LOG_START}\n" + f"{debug_log}" # no need for an extra newline here + f"{DOC_TO_PIXELS_LOG_END}" ) diff --git a/install/linux/build-rpm.py b/install/linux/build-rpm.py index 162513c..1cec7d2 100755 --- a/install/linux/build-rpm.py +++ b/install/linux/build-rpm.py @@ -69,9 +69,10 @@ def build(build_dir, qubes=False): container_tar_gz = root / "share" / "container.tar.gz" container_tar_gz_bak = root / "container.tar.gz.bak" - tessdata.rename(tessdata_bak) + if tessdata.exists(): + tessdata.rename(tessdata_bak) stash_container = qubes and container_tar_gz.exists() - if stash_container: + if stash_container and container_tar_gz.exists(): container_tar_gz.rename(container_tar_gz_bak) try: subprocess.run(["poetry", "build", "-f", "sdist"], cwd=root, check=True) @@ -81,8 +82,9 @@ def build(build_dir, qubes=False): shutil.copy2(sdist_path, build_dir / "SOURCES" / sdist_name) sdist_path.unlink() finally: - tessdata_bak.rename(tessdata) - if stash_container: + if tessdata_bak.exists(): + tessdata_bak.rename(tessdata) + if stash_container and container_tar_gz_bak.exists(): container_tar_gz_bak.rename(container_tar_gz) print("* Building RPM package") diff --git a/install/linux/vendor-pymupdf.py b/install/linux/vendor-pymupdf.py index 88e2fcb..1a0efdd 100755 --- a/install/linux/vendor-pymupdf.py +++ b/install/linux/vendor-pymupdf.py @@ -5,7 +5,6 @@ import subprocess import sys from pathlib import Path - DZ_VENDOR_DIR = Path("./dangerzone/vendor") diff --git a/poetry.lock b/poetry.lock index 78d862b..25f1ee9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1046,3 +1046,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" +content-hash = "93097a7d09c23ca12dbedd440965381fdd12dca2a8b1a0defe0f75b0e4e2092a"