From dc935b381fea22d80e72ff43d0a2391daef750de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 17 Jan 2020 15:51:35 +0000
Subject: subr/pkg_install_rpm.subr: loop on rpmbuild(1) given exit w/ 141.

---
 subr/pkg_install_rpm.subr | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'subr/pkg_install_rpm.subr')

diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr
index 2a3cac1c..59667388 100644
--- a/subr/pkg_install_rpm.subr
+++ b/subr/pkg_install_rpm.subr
@@ -21,7 +21,6 @@ pkg_install_rpm() {
 			fi;
 		fi;
 		cat > "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" <<EOF
-Buildroot:      ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}/BUILDROOT
 Name:           ${PKG_NAME}
 Version:        ${_pkg_version_rpm}
 Release:        1
@@ -48,11 +47,20 @@ cp -pPr "${PKG_DESTDIR}/." "\${RPM_BUILD_ROOT}"
 %changelog
 
 EOF
-		rpmbuild									\
-			-bb									\
-			--define="_tmppath ${BUILD_WORKDIR}"					\
-			--define="_topdir ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}"	\
-			--nodeps "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec";
+		while true; do
+			if ! rpmbuild									\
+				-bb									\
+				--define="_tmppath ${BUILD_WORKDIR}"					\
+				--define="_topdir ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}"	\
+				--nodeps "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec";
+			then
+				if [ "${?}" -ne 141 ]; then
+					break;
+				fi;
+			else
+				break;
+			fi;
+		done;
 		find "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}/RPMS" -iname \*.rpm -exec cp -pP {} "${PREFIX_RPM}/" \;;
 		ex_rtl_fileop rm "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}";
 		ex_rtl_fileop cp "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" "${PREFIX_RPM}/";
-- 
cgit v1.2.3