clearlinux/common
2
0
Fork 0
mirror of https://github.com/clearlinux/common.git synced 2026-09-06 13:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup parsing of version from specfile in catchup targets

Browse Source 
Make sure we only parse %{version} one time while doing a catchup.
This commit is contained in:
Brett T. Warden
2024-12-05 17:11:40 -08:00
parent 1ca80a16a3
commit 0c46f45876
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.common
+3 -2
View File
@@ -608,8 +608,9 @@ catchup-%:
echo "Error: Target commit/tag $${target} not found"; \
exit 1; \
fi; \
echo "Version: $$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1)"; \
current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?v?$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1)$$") || { \
version=$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1); \
echo "Version: $${version}"; \
current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?v?$${version}$$") || { \
echo "Error: No tag found for current package version"; \
exit 1; \
}; \