Skip to content
This repository was archived by the owner on Jul 9, 2019. It is now read-only.

Commit c4b09b9

Browse files
author
Alasdair Lumsden
committed
1454 oi-build package-install target sometimes fails due to bad escaping in ips.mk
Reviewed by: Alasdair Lumsden <[email protected]> Reviewed by: Gordon Ross <[email protected]> Approved by: Alasdair Lumsden <[email protected]>
1 parent 9c19e9d commit c4b09b9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

make-rules/ips.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ $(BUILD_DIR)/.published-$(MACH): $(PUBLISHED)
171171

172172
$(MANIFEST_BASE)-%.installed: $(MANIFEST_BASE)-%.published
173173
@echo "Installing package from manifest: $<"
174-
@export PACKAGEFMRI=`cat $< | $(GSED) ':a;N;$!ba;s/\\\n/ /g' | \
174+
@export PACKAGEFMRI=`cat $< | $(GSED) ':a;N;$$!ba;s/\\\\\\n/ /g' | \
175175
grep '^set name=pkg.fmri' | $(GSED) 's/.*value=//g'` && \
176176
echo "Installing package $$PACKAGEFMRI" && \
177177
$(PRIV_CMD) pkg install -v $$PACKAGEFMRI ; exit=$$? ; \

0 commit comments

Comments
 (0)