From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 0D2021F4C0 for ; Sun, 13 Oct 2019 16:31:02 +0000 (UTC) Received: from localhost ([::1]:40968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJglp-0003mN-66 for normalperson@yhbt.net; Sun, 13 Oct 2019 12:31:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43694) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJglh-0003ke-Pr for bug-gnulib@gnu.org; Sun, 13 Oct 2019 12:30:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJglf-00039b-8A for bug-gnulib@gnu.org; Sun, 13 Oct 2019 12:30:52 -0400 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::11]:33011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iJgle-00038K-0T for bug-gnulib@gnu.org; Sun, 13 Oct 2019 12:30:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1570984248; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=DOMZERZn6CbkmFAeqaCN7+06PYN2OxYdXPWr6gGc3JQ=; b=r8AtTnJRiCxY/KMHvIwSPXzFod7dmvrpWbl/PcNTfbG86ODXIzz1kS+t3O3Gcb00cB OWMgWUXyj0egj2GuIrpcIX9okWov+Qtjk4ikgjgSMZmHJGZjpYHJJdmu6Tj+EmvRPei7 jyPDF4qu8SePMi9EBWZGoAz7cS1SARKhsFvN+oofLXkALpiElyObiw3Qt6onrYTA1lnv /g+4GHBRhoK/BQmcZW8dBbxDAO/NyTiAHv+u76loerX7oBAIl0ICNn5SqFjka1EIojGf l1NnLx6UEl8rYesw1CBtIWwXLC4g59FqgzmjPpgj0ET+cji3PdLawf41km7m8XwcWwUr 4QAg== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOGaf0zJZW" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 44.28.0 DYNA|AUTH) with ESMTPSA id N06099v9DGUloXY (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Sun, 13 Oct 2019 18:30:47 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org Subject: git-version-gen: allow 'snapshot' as .tarball-version contents Date: Sun, 13 Oct 2019 18:30:47 +0200 Message-ID: <4073770.ak1ocBl5qt@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-165-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:238:20a:202:5300::11 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" Hi, git-version-gen currently rejects some forms of .tarball-version: $ cat > .tarball-version 20191011 $ build-aux/git-version-gen .tarball-version; echo 20191011 $ cat > .tarball-version snapshot $ build-aux/git-version-gen .tarball-version; echo build-aux/git-version-gen: WARNING: .tarball-version is missing or damaged UNKNOWN I need a non-numeric version for continuous publishing of gettext snapshot tarballs, and I want the tarballs to be called gettext-snapshot.tar.gz, not gettext-UNKNOWN.tar.gz. This patch fixes the problem. 2019-10-13 Bruno Haible git-version-gen: Allow 'snapshot' as .tarball-version contents. * build-aux/git-version-gen: Don't map non-numeric .tarball-version contents to the empty string. diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 45b5656..d855645 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -142,11 +142,9 @@ then v=`cat $tarball_version_file` || v= case $v in *$nl*) v= ;; # reject multi-line output - [0-9]*) ;; - *) v= ;; esac test "x$v" = x \ - && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 + && echo "$0: WARNING: $tarball_version_file is damaged" 1>&2 fi if test "x$v" != x