From 31b54786792c8006694c54e316ee7dfd8f00f3a2 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 12 Jul 2021 14:37:20 +0200 Subject: [PATCH] copr-be: don't fail enable-swap when not necessary Ppc64le images have tsflags=nodocs set, so "rpm --setperms" fails with chmod: cannot access '/usr/share/man/man1/copr-rpmbuild.1.gz': No such file or directory Also, there's a new directory ../workspace, see: https://pagure.io/copr/copr/c/52e8393ce4f1984b38aa145667fa694143985853 --- roles/copr/backend/files/provision/files/enable-swap.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/copr/backend/files/provision/files/enable-swap.sh b/roles/copr/backend/files/provision/files/enable-swap.sh index 9842a01903..6eef44e75a 100644 --- a/roles/copr/backend/files/provision/files/enable-swap.sh +++ b/roles/copr/backend/files/provision/files/enable-swap.sh @@ -39,8 +39,9 @@ mkfs.ext4 "${swap_device}${part_suffix}1" mount "$swap_device${part_suffix}1" /var/lib/copr-rpmbuild mkdir /var/lib/copr-rpmbuild/results -rpm --setperms copr-rpmbuild -rpm --setugids copr-rpmbuild +mkdir /var/lib/copr-rpmbuild/workspace +rpm --setperms copr-rpmbuild || : +rpm --setugids copr-rpmbuild || : mkswap "${swap_device}${part_suffix}2" swapon "${swap_device}${part_suffix}2"