IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail if optional RPM macros file is missing

Browse Source 
With fix for https://pagure.io/freeipa/issue/7951 we started to modify
RPM macros in Azure CI environment. Don't fail if the file does not
exist anymore like it happens now in Fedora.

Fixes: https://pagure.io/freeipa/issue/9347

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Francisco Trivino <ftrivino@redhat.com>
This commit is contained in:
Alexander Bokovoy 2023-03-20 15:50:58 +02:00 committed by Florence Blanc-Renaud
parent 4acd9fe9f7
commit 779aa6bc11
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipatests/azure/Dockerfiles/Dockerfile.build.fedora
View File

@ -5,7 +5,7 @@ ENV container=docker LANG=en_US.utf8 LANGUAGE=en_US.utf8 LC_ALL=en_US.utf8
ADD dist /root ADD dist /root
RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \ RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \
&& dnf update -y dnf \ && dnf update -y dnf \
&& sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf \ && (sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf ||:) \
&& dnf install -y systemd \ && dnf install -y systemd \
&& dnf install -y \ && dnf install -y \
firewalld \ firewalld \

2
ipatests/azure/Dockerfiles/Dockerfile.build.rawhide
View File

@ -7,7 +7,7 @@ ENV container=docker LANG=en_US.utf8 LANGUAGE=en_US.utf8 LC_ALL=en_US.utf8
ADD dist /root ADD dist /root
RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \ RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \
&& dnf update -y dnf \ && dnf update -y dnf \
&& sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf \ && (sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf ||:) \
&& dnf install -y systemd \ && dnf install -y systemd \
&& dnf install -y \ && dnf install -y \
firewalld \ firewalld \