mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-22 07:43:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8554 from bket/openbsd_vagrant

Browse source 
Fix issues seen with the OpenBSD vagrant box
This commit is contained in:
TW 2024-11-20 11:31:26 +01:00 committed by GitHub
commit d1b2884204
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Vagrantfile vendored
View file

@ -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

6
src/borg/logger.py
View file

@ -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}"