Skip to content

Commit 0adcc1a

Browse files
committed
ci(fedora): Fix syntax for dnf5, don't use sbin
sbin is being unified with bin fedora: https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin The path for the transaction history sqlite moved as well
1 parent c298dcf commit 0adcc1a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/docker/fedoradev/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ ADD test-cmd-list.txt \
1919

2020
RUN /tmp/install-packages.sh </tmp/test-cmd-list.txt \
2121
&& dnf -Cy clean all \
22-
&& rm -r /tmp/* /var/lib/dnf/history.sqlite* /var/lib/dnf/repos/*
22+
&& rm -r /tmp/* /usr/lib/sysimage/libdnf5/transaction_history.sqlite* /var/lib/dnf/repos/*

test/docker/fedoradev/install-packages.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ dnf -y install /usr/bin/xargs
1616
while read -r file; do
1717
case $file in
1818
/*) printf "%s\n" "$file" ;;
19-
*) printf "%s\n" {/usr,}/{,s}bin/"$file" ;;
19+
*) printf "%s\n" {/usr,}/bin/"$file" ;;
2020
esac
2121
done |
22-
xargs dnf --skip-broken -y install
22+
xargs dnf -y install --skip-unavailable --skip-broken
2323
# --skip-broken: avoid failing on not found packages. Also prevents actually
2424
# broken packages from failing the install which is not what we want, but
2525
# there doesn't seem to be way to cleanly just skip the not found ones.

0 commit comments

Comments
 (0)