From 779aa6bc11f075d6c4665773396390a50e1865d9 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 20 Mar 2023 15:50:58 +0200 Subject: [PATCH] Don't fail if optional RPM macros file is missing 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 Reviewed-By: Francisco Trivino --- ipatests/azure/Dockerfiles/Dockerfile.build.fedora | 2 +- ipatests/azure/Dockerfiles/Dockerfile.build.rawhide | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipatests/azure/Dockerfiles/Dockerfile.build.fedora b/ipatests/azure/Dockerfiles/Dockerfile.build.fedora index 0cf1483ce..b4e012de1 100644 --- a/ipatests/azure/Dockerfiles/Dockerfile.build.fedora +++ b/ipatests/azure/Dockerfiles/Dockerfile.build.fedora @@ -5,7 +5,7 @@ ENV container=docker LANG=en_US.utf8 LANGUAGE=en_US.utf8 LC_ALL=en_US.utf8 ADD dist /root RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \ && 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 \ firewalld \ diff --git a/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide b/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide index 70ad9e804..575ad10b2 100644 --- a/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide +++ b/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide @@ -7,7 +7,7 @@ ENV container=docker LANG=en_US.utf8 LANGUAGE=en_US.utf8 LC_ALL=en_US.utf8 ADD dist /root RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \ && 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 \ firewalld \