From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 7 Nov 2015 14:06:51 +0000 (+0100)
Subject: ignore errors when (un-)installing devel packages
X-Git-Tag: 5.3.10~15
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=08e502fb6ed3aa35b1109b03dc4310538852a068

ignore errors when (un-)installing devel packages
---

diff --git a/Makefile b/Makefile
index 76db1106..6743529c 100644
--- a/Makefile
+++ b/Makefile
@@ -581,11 +581,11 @@ endef
 
 # install stock rpms if defined
 define rpmyum_install_stock_rpms 
-	$(if $($(1)-STOCK-DEVEL-RPMS), echo "Installing for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-INSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS))
+	$(if $($(1)-STOCK-DEVEL-RPMS), echo "Installing for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-INSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS) || true)
 endef
 
 define rpmyum_uninstall_stock_rpms
-	-$(if $($(1)-STOCK-DEVEL-RPMS), echo "Unstalling for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS))
+	-$(if $($(1)-STOCK-DEVEL-RPMS), echo "Unstalling for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS) || true)
 endef
 
 # similar for debians
@@ -599,11 +599,11 @@ define dpkgapt_install_local_debs
 endef
 
 define dpkgapt_install_stock_debs 
-	$(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS))
+	$(if $($(1)-STOCK-DEVEL-DEBS), echo "Installing for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-INSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS) || true)
 endef
 
 define dpkgapt_uninstall_stock_debs
-	-$(if $($(1)-STOCK-DEVEL-DEBS), echo "Unstalling for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS))
+	-$(if $($(1)-STOCK-DEVEL-DEBS), echo "Unstalling for $(1)-STOCK-DEVEL-DEBS" ; $(DPKGAPT-UNINSTALL-STOCK) $($(1)-STOCK-DEVEL-DEBS) || true)
 endef