changeset 444:a23b78c04351

1315 oi-build package-install fails on already installed packages
author Alasdair Lumsden <al@everycity.co.uk>
date Mon, 01 Aug 2011 23:09:50 +0100
parents 3ff5ea57dd2b
children 2b9d1a6a8053
files make-rules/ips.mk
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make-rules/ips.mk	Sun Jul 31 17:45:07 2011 +0100
+++ b/make-rules/ips.mk	Mon Aug 01 23:09:50 2011 +0100
@@ -173,7 +173,8 @@
 	@export PACKAGEFMRI=`cat $< | $(GSED) ':a;N;$!ba;s/\\\n/ /g' | \
 		grep '^set name=pkg.fmri' | $(GSED) 's/.*value=//g'` && \
 		echo "Installing package $$PACKAGEFMRI" && \
-		$(PRIV_CMD) pkg install -v $$PACKAGEFMRI
+		$(PRIV_CMD) pkg install -v $$PACKAGEFMRI ; exit=$$? ; \
+		if [ $$exit -eq 4 ] ; then (exit 0) ; else (exit $$exit) ; fi
 	$(TOUCH) $@
 
 print-package-names:	canonical-manifests