[PATCH 6/6] build-system: guard parts irrevokable parts of release target with REALLY...

diff --git a/47/5bf1778de776edd1cbdc7a7324d45694b957c6 b/47/5bf1778de776edd1cbdc7a7324d45694b957c6
new file mode 100644 (file)
index 0000000..c39794b
--- /dev/null
+++ b/47/5bf1778de776edd1cbdc7a7324d45694b957c6
@@ -0,0 +1,89 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 84F76429E28\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:04:02 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id sijoiaucE1yh for <notmuch@notmuchmail.org>;\r
+       Mon,  4 Jul 2011 05:04:01 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 78AF7429E2B\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:04:00 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [142.167.177.149]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p64C3vid027983\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Mon, 4 Jul 2011 09:03:57 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Qdhsa-0008Mv-RT; Mon, 04 Jul 2011 09:03:56 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 6/6] build-system: guard parts irrevokable parts of release\r
+       target with REALLY_UPLOAD\r
+Date: Mon,  4 Jul 2011 09:03:41 -0300\r
+Message-Id: <1309781021-32062-7-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net>\r
+References: <1309781021-32062-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 04 Jul 2011 12:04:02 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This supports both testing and use by non-upload privileged\r
+users. Along with previous commits in the series, this lets one do a\r
+dry run of the release process and created a tarball, signature file,\r
+and release announcement to inspect before uploading.\r
+---\r
+ Makefile.local |    8 +++++---\r
+ 1 files changed, 5 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index a291195..6b2a3a7 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -97,12 +97,14 @@ release: verify-source-tree-and-version\r
+       $(MAKE) VERSION=$(VERSION) test\r
+       git tag -v $(VERSION) || git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)\r
+       $(MAKE) VERSION=$(VERSION) $(GPG_FILE)\r
+-      scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)\r
+-      ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"\r
+       mkdir -p releases\r
+       mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases\r
+-      git push origin $(VERSION)\r
+       $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce\r
++ifeq ($(REALLY_UPLOAD),yes)\r
++      git push origin $(VERSION)\r
++      cd releases && scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)\r
++      ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"\r
++endif\r
+       @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."\r
+ \r
+ .PHONY: release-message\r
+-- \r
+1.7.5.4\r
+\r