From b59769dcfe9e3b9de48b0ab05a1e5098db70af68 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Fri, 30 Nov 2007 23:06:23 +0000 Subject: [PATCH] Install all RPMs in the same transaction, in case they depend on eachother. Fail if dependencies cannot be installed. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f9133542..cb623ebe 100644 --- a/Makefile +++ b/Makefile @@ -420,8 +420,10 @@ ifeq "$(subst srpm,,$(1))" "$(1)" $($(1)-SRPM): $($(1)_specpath) .rpmmacros $($(1)-TARBALLS) mkdir -p BUILD SRPMS tmp @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) " ; date) - -$(foreach devel,$($(1)-DEPENDDEVELS), $(if $($(devel)-DEVEL-RPMS),rpm --force -Uvh $($(devel)-DEVEL-RPMS);)) - -$(foreach rpm,$($(1)-DEPENDDEVELRPMS), rpm --force -Uvh $($(rpm)-RPM-PATH);) + deps="$(foreach devel,$($(1)-DEPENDDEVELS),$(if $($(devel)-DEVEL-RPMS), $($(devel)-DEVEL-RPMS))) \ + $(foreach rpm,$($(1)-DEPENDDEVELRPMS), $($(rpm)-RPM-PATH))"; \ + if test -n "$$$${deps/ /}"; then rpm -Uvh --force $$$$deps; \ + else :; fi $(if $($(1)-RPMBUILD),\ $($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath), $(RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath)) -- 2.47.0