From af15c79f1ce60a5b975f3e81b48856328014fd2c Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 29 Aug 2007 03:02:02 +0000 Subject: [PATCH] When tagging, only delete and re-create distro-specific tags directories. Don't delete the parent (tag number) directory. --- releasetools/Targets.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk index 82ca3d2ed..afe8c8a49 100644 --- a/releasetools/Targets.mk +++ b/releasetools/Targets.mk @@ -232,12 +232,15 @@ announce: $(ANNOUNCE_CHANGES) .announcement-text distrib tag: ifeq (,$(shell svn status)) -ifneq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG) 2>/dev/null)) - $(SVN) $(SVN_OPTS) delete -m "deleting the $(ZIPVER) tag" \ +ifneq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO) 2>/dev/null)) + $(SVN) $(SVN_OPTS) delete -m "deleting the $(DISTRO) $(ZIPVER) tag" \ + $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO) +endif +ifeq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG) 2>/dev/null)) + $(SVN) $(SVN_OPTS) mkdir -m "creating the $(ZIPVER) tag" \ $(REPOSITORY_ROOT)/tags/$(TAG) endif - $(SVN) $(SVN_OPTS) mkdir -m "creating the $(ZIPVER) tag" $(REPOSITORY_ROOT)/tags/$(TAG) \ - && $(SVN) $(SVN_OPTS) copy -m "tagging the docbook-$(DISTRO) $(ZIPVER) release" \ + $(SVN) $(SVN_OPTS) copy -m "tagging the $(DISTRO) $(ZIPVER) release" \ -r $(REVISION) $(DISTRO_URL) $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO) else @echo "Unversioned or uncommitted files found. Before tagging/uploading" -- 2.40.0