File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ distname="${SAMBACC_DISTNAME}"
9
9
# use SAMBACC_BUILD_TASKS to limit build tasks if needed
10
10
tasks=" ${SAMBACC_BUILD_TASKS:- task_test_tox task_py_build task_rpm_build task_gen_sums} "
11
11
dist_prefix=" ${SAMBACC_DIST_PREFIX:-/ srv/ dist} "
12
+ dnf_cmd=dnf
12
13
13
14
info () {
14
15
echo " [[sambacc/build]] $* "
@@ -129,12 +130,12 @@ task_sys_deps() {
129
130
)
130
131
131
132
if [ " $use_centos " ]; then
132
- yum install -y epel-release
133
+ " ${dnf_cmd} " install -y epel-release
133
134
yum_args=(--enablerepo=crb)
134
135
pkgs+=(pyproject-rpm-macros)
135
136
fi
136
- yum " ${yum_args[@]} " install -y " ${pkgs[@]} "
137
- yum clean all
137
+ " ${dnf_cmd} " " ${yum_args[@]} " install -y " ${pkgs[@]} "
138
+ " ${dnf_cmd} " clean all
138
139
}
139
140
140
141
task_test_tox () {
@@ -216,6 +217,10 @@ cleanup() {
216
217
fi
217
218
}
218
219
220
+ if ! command -v " ${dnf_cmd} " > /dev/null ; then
221
+ dnf_cmd=yum
222
+ fi
223
+
219
224
# Allow the tests to use customized passwd file contents in order
220
225
# to test samba passdb support. It's a bit strange, but should work.
221
226
# The test suite tries to restore the passwd file after changing it,
You can’t perform that action at this time.
0 commit comments