Skip to content

Commit 3f13320

Browse files
committed
[#3738] Do not update repos on FreeBSD in hammer.py
1 parent 880885d commit 3f13320

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

hammer.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
3+
# Copyright (C) 2018-2025 Internet Systems Consortium, Inc. ("ISC")
44
#
55
# This Source Code Form is subject to the terms of the Mozilla Public
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -552,7 +552,7 @@ def install_pkgs(pkgs, timeout=60, env=None, check_times=False, pkg_cache=None):
552552
env['DEBIAN_FRONTEND'] = 'noninteractive'
553553
cmd = 'sudo apt install --no-install-recommends -y'
554554
elif system == 'freebsd':
555-
cmd = 'sudo pkg install -y'
555+
cmd = 'sudo pkg install --no-repo-update --yes'
556556
elif system == 'alpine':
557557
cmd = 'sudo apk add'
558558
elif system == 'arch':
@@ -1021,7 +1021,7 @@ def prepare_system(self):
10211021
self.execute("sudo dnf install -y python36 rpm-build python3-virtualenv", attempts=3)
10221022
elif self.system == 'freebsd':
10231023
if self.revision.startswith('13'):
1024-
self.execute("sudo pkg install -y python3", attempts=3)
1024+
self.execute("sudo pkg install --no-repo-update --yes python3", attempts=3)
10251025

10261026
# select proper python version for running Hammer inside Vagrant system
10271027
if self.system == 'freebsd':
@@ -1960,13 +1960,6 @@ def link_pg_config():
19601960

19611961
# prepare freebsd
19621962
elif system == 'freebsd':
1963-
# Packages are already upgraded by default when installing a package,
1964-
# so to avoid mismatching dependency versions, inaccurate dynamic
1965-
# version fetching and other troubles, clean up local cache and
1966-
# install an arbitrary package to fetch remote first.
1967-
execute('sudo pkg clean -a -y')
1968-
execute('sudo pkg install -y pkg')
1969-
19701963
packages = ['autoconf', 'automake', 'bison', 'flex', 'libtool', 'openssl', 'log4cplus', 'boost-libs', 'wget']
19711964

19721965
if revision.startswith('14'):

0 commit comments

Comments
 (0)