[PATCH 5/6] build-system: Use existing signed tag for release, if present.

david at tethera.net david at tethera.net
Mon Jul 4 05:03:40 PDT 2011


From: David Bremner <bremner at debian.org>

This is to support testing the release machinery without jumping
through hoops to delete and restore a tag, or bumping the version
number in both version and debian/changelog.
---
 Makefile.local |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index d1c0737..a291195 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -95,7 +95,7 @@ release: verify-source-tree-and-version
 	$(MAKE) VERSION=$(VERSION) verify-newer
 	$(MAKE) VERSION=$(VERSION) clean
 	$(MAKE) VERSION=$(VERSION) test
-	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
+	git tag -v $(VERSION) || git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
 	scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
 	ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-- 
1.7.5.4



More information about the notmuch mailing list