diff options
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | setup.py | 11 | ||||
| -rw-r--r-- | src/borg/archiver.py | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c64da0ce..97e5fe196 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: env: # Configure pkg-config to use OpenSSL from Homebrew - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" TOXENV: ${{ matrix.toxenv }} runs-on: ${{ matrix.os }} @@ -125,7 +125,7 @@ jobs: env: # we already have that in the global env, but something is broken and overwrites that. # so, set it here, again. - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" run: | # pip install -e . python setup.py -v develop @@ -133,7 +133,7 @@ jobs: env: # we already have that in the global env, but something is broken and overwrites that. # so, set it here, again. - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH: "/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH" run: | # do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482. #sudo -E bash -c "tox -e py" @@ -16,8 +16,13 @@ from setuptools.command.sdist import sdist try: from Cython.Build import cythonize -except ImportError: + cythonize_import_error_msg = None +except ImportError as exc: + # either there is no Cython installed or there is some issue with it. cythonize = None + cythonize_import_error_msg = "ImportError: " + str(exc) + if "failed to map segment from shared object" in cythonize_import_error_msg: + cythonize_import_error_msg += " Check if the borg build uses a +exec filesystem." sys.path += [os.path.dirname(__file__)] import setup_checksums @@ -134,7 +139,9 @@ else: cython_c_files = [fn.replace('.pyx', '.c') for fn in cython_sources] if not on_rtd and not all(os.path.exists(path) for path in cython_c_files): - raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.') + raise ImportError("The GIT version of Borg needs a working Cython. " + + "Install or fix Cython or use a released borg version. " + + "Importing cythonize failed with: " + cythonize_import_error_msg) def rm(file): diff --git a/src/borg/archiver.py b/src/borg/archiver.py index e46fe1109..f5907c3b9 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1619,7 +1619,7 @@ class Archiver: rule=kept_because[archive.id][0], num=kept_because[archive.id][1] ) if args.output_list: - list_logger.info("{message:<40} {archive}".format( + list_logger.info("{message:<44} {archive}".format( message=log_message, archive=format_archive(archive) )) pi.finish() |