From 1616e12d7a599c3b72df64b006f60581bf7f6931 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 5 Dec 2011 13:39:32 +0200 Subject: [PATCH] [PATCH] make release: remove LATEST-$(PACKAGE)-* --- c9/16e4e4a77afed3b1454d91c81349e0ca841cf4 | 131 ++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 c9/16e4e4a77afed3b1454d91c81349e0ca841cf4 diff --git a/c9/16e4e4a77afed3b1454d91c81349e0ca841cf4 b/c9/16e4e4a77afed3b1454d91c81349e0ca841cf4 new file mode 100644 index 000000000..0b45fda9c --- /dev/null +++ b/c9/16e4e4a77afed3b1454d91c81349e0ca841cf4 @@ -0,0 +1,131 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 73C09429E25 + for ; Mon, 5 Dec 2011 03:39:40 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id vR5mipjWTMET for ; + Mon, 5 Dec 2011 03:39:39 -0800 (PST) +Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2E337429E21 + for ; Mon, 5 Dec 2011 03:39:39 -0800 (PST) +Received: from pps.filterd (mail-gw3 [127.0.0.1]) + by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id pB5BcWBM019807; + Mon, 5 Dec 2011 13:39:33 +0200 +Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) + by mail-gw3.nixu.fi with ESMTP id 114cs0m8kg-1 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Mon, 05 Dec 2011 13:39:33 +0200 +Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) + by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id + pB5BdWMk012916; Mon, 5 Dec 2011 13:39:32 +0200 +From: Tomi Ollila +To: David Bremner , notmuch@notmuchmail.org +Subject: [PATCH] make release: remove LATEST-$(PACKAGE)-* +In-Reply-To: <87y5utsdys.fsf@rocinante.cs.unb.ca> +References: + <87y5utsdys.fsf@rocinante.cs.unb.ca> +User-Agent: Notmuch/0.10+55~gde3d46e (http://notmuchmail.org) Emacs/23.3.1 + (i686-pc-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110, + 1.0.211, 0.0.0000 definitions=2011-12-05_02:2011-12-04, 2011-12-05, + 1970-01-01 signatures=0 +X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 + ipscore=0 suspectscore=0 + phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 + reason=mlx + scancount=1 engine=6.0.2-1012030000 definitions=main-1112050053 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 05 Dec 2011 11:39:40 -0000 + +The tar file of particular package (notmuch in this case) is named +as $(PACKAGE)-$(VERSION).tar.gz. Therefore the best way to remove +previous link to LATEST is to remove all files beginning with +LATEST-$(PACKAGE)- and not relying how $(VERSION) string is constructed. +--- + +Applies on top of id:"yf6ty5ttfs2.fsf@taco2.nixu.fi" + +More discussion at the end of this email. + + Makefile.local | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index b4faada..d699463 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -122,7 +122,7 @@ release: verify-source-tree-and-version + ifeq ($(REALLY_UPLOAD),yes) + git push origin $(VERSION) + cd releases && 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-$(TAR_FILE)" ++ ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)" + endif + @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template." + +-- +1.7.7.3 + +Subject: Re: [PATCH] have LATEST-notmuch-.tar.gz on releases web page + +On Sat, 03 Dec 2011 10:32:43 -0800, David Bremner wrote: +> On Thu, 24 Nov 2011 22:41:01 +0200, Tomi Ollila wrote: +> > The notmuchmail/releases page used to have LATEST-notmuch- +> > to link to the latest notmuch source tarball. This is confusing on +> > web page and on disk when the file has been downloaded. This change +> > looks a bit inconsistent with the 'rm' command just executed before. +> > $(TAR_FILE) is defined (currently) as $(PACKAGE)-$(VERSION).tar.gz; +> > as long as the prefix stays $(PACKAGE)-$(VERSION) and version begins +> > with a digit then this line is good in execution point of view. +> +> On IRC we talked about changing the rm command in this since I +> bootstrapped the process by hand. Did you come to a conclusion one way +> or the other? + +Yes. IMO Instead of rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* +this should just be rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* + +This change and the patch in question are independent of each other +as the former would fail to remove the LATEST- -file if $(VERSION) +started without number in any case. + +I don't see anything else that could be used to make rm more consistent +in case the -$(PACKAGE)-$(VERSION) is changed to -$(TAR_FILE) -- still, it +would be silly to use -$(PACKAGE)-$(VERSION).tar.gz there; also this definition + +TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz + +in Makefile.local looks pretty robust. + +> d + +Tomi -- 2.26.2