[cpp-linbuild] branch main updated: Anchor SPEC version sanity check to EOL

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=9d9bef81123f4d85fc707d258650b87ac1fb48bc

The following commit(s) were added to refs/heads/main by this push:
       new  9d9bef8   Anchor SPEC version sanity check to EOL
9d9bef8 is described below

commit 9d9bef81123f4d85fc707d258650b87ac1fb48bc
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri May 21 14:51:19 2021 +0000

    Anchor SPEC version sanity check to EOL
    
    Ensure that (e.g.) "w.x.y.z" isn't treated as sanely equivalent to "w.x.y".
    
    This sanity check accidentally snuck in with the shibboleth 3.2.2 update.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e9e8607..34a8de9 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,7 @@ $(1)_$(2)_token = $(srcdir).$(1)_$(2)_products
 $$($(1)_$(2)_token): $$($(1)_$(2)_image_token) $(SOURCEDIR)/$$($(1)_DISTFILE) $(SPECDIR)/$$($(1)_COMPNAME).spec
 	mkdir -p $(srcdir)os/$(2)/products/{RPMS,SRPMS}
 	@echo "==> Sanity checking $(1) on $(2)"
-	grep -E "^Version:[[:space:]]+$$($(1)_VERSION)" $(SPECDIR)/$$($(1)_COMPNAME).spec
+	grep -E "^Version:[[:space:]]+$$($(1)_VERSION)$$$$" $(SPECDIR)/$$($(1)_COMPNAME).spec
 	@echo "==> Building $(1) on $(2)"
 	docker run -it --rm \
 		--mount type=bind,source=$(srcdir)os/$(2)/products,target=/opt/build/external/out \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.