24676059 {GIT,HG}_HASH lines not replaced properly
authorDanek Duvall <danek.duvall@oracle.com>
Thu, 15 Sep 2016 14:25:24 -0700
changeset 6951 deaf66c90a34
parent 6950 b14572a6af9b
child 6952 ce0a03807d13
24676059 {GIT,HG}_HASH lines not replaced properly
make-rules/prep-git.mk
make-rules/prep-hg.mk
--- a/make-rules/prep-git.mk	Thu Sep 15 14:23:59 2016 -0700
+++ b/make-rules/prep-git.mk	Thu Sep 15 14:25:24 2016 -0700
@@ -104,7 +104,7 @@
 	$(RM) -r $$$${TMP_REPO} ) && \
 	( GIT_HASH=$$$$(digest -a sha256 [email protected]) && \
 	$(GSED) -i \
-		-e "s/^GIT_HASH$(1)=.*/GIT_HASH$(1)=  sha256:$$$${GIT_HASH}/" \
+		-e "s/\(GIT_HASH$(1)[[:space:]]*=[[:space:]]*\).*/\1sha256:$$$${GIT_HASH}/" \
 		Makefile ))
 
 
--- a/make-rules/prep-hg.mk	Thu Sep 15 14:23:59 2016 -0700
+++ b/make-rules/prep-hg.mk	Thu Sep 15 14:25:24 2016 -0700
@@ -74,7 +74,7 @@
 	 $(RM) -rf $${TMP_REPO} && \
 	 HG_HASH=$$$$(digest -a sha256 [email protected]) && \
 	 $(GSED) -i \
-		-e "s/^HG_HASH$(1)=.*/HG_HASH$(1)=	sha256:$$$${HG_HASH}/" \
+		-e "s/\(HG_HASH$(1)[[:space:]]*=[[:space:]]*\).*/\1sha256:$$$${HG_HASH}/" \
 		Makefile)
 
 REQUIRED_PACKAGES += developer/versioning/mercurial