Skip to content

Commit

Permalink
Merge pull request #8554 from bket/openbsd_vagrant
Browse files Browse the repository at this point in the history
Fix issues seen with the OpenBSD vagrant box
  • Loading branch information
ThomasWaldmann authored Nov 20, 2024
2 parents 43fe359 + 33834c4 commit d1b2884
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ end

def packages_openbsd
return <<-EOF
echo "https://ftp.eu.openbsd.org/pub/OpenBSD" > /etc/installurl
pkg_add bash
chsh -s bash vagrant
pkg_add xxhash
Expand Down
6 changes: 6 additions & 0 deletions src/borg/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ def format(self, record: logging.LogRecord) -> str:
# warnings.filterwarnings('ignore', r'... regex for warning message to ignore ...')


# we do not want that urllib spoils test output with LibreSSL related warnings on OpenBSD.
# NotOpenSSLWarning: urllib3 v2 only supports OpenSSL 1.1.1+,
# currently the 'ssl' module is compiled with 'LibreSSL 3.8.2'.
warnings.filterwarnings("ignore", message=r".*urllib3 v2 only supports OpenSSL.*")


def _log_warning(message, category, filename, lineno, file=None, line=None):
# for warnings, we just want to use the logging system, not stderr or other files
msg = f"{filename}:{lineno}: {category.__name__}: {message}"
Expand Down

0 comments on commit d1b2884

Please sign in to comment.