Re: [PATCH] git-version-gen: initialize prefix

[Jim Meyering]

Andreas Oberritter wrote:

> Initialize (version-)prefix to prevent inheritance from
> the build environment during autoreconf.
>
> | sed: -e expression #1, char 9: unknown option to `s'
> | configure.ac:55: error: AC_INIT should be called with package and
> | version arguments
> | aclocal.m4:594: AM_INIT_AUTOMAKE is expanded from...
> | configure.ac:55: the top level
> | autom4te: /usr/bin/m4 failed with exit status: 1
>
> Signed-off-by: Andreas Oberritter <address@hidden>
>
> --- parted-3.1/build-aux/git-version-gen.orig 2012-03-15 13:51:38.911841912 
> +0100
> +++ parted-3.1/build-aux/git-version-gen      2012-03-15 13:51:50.171841800 
> +0100
> @@ -92,6 +92,8 @@
>
>  Running without arguments will suffice in most cases."
>
> +prefix="v"
> +
>  while test $# -gt 0; do
>    case $1 in
>      --help) echo "$usage"; exit 0;;

Thank you for the report and patch.
That file comes from gnulib:

    http://git.sv.gnu.org/cgit/gnulib.git/

I've adjusted your patch to remove the quotes (stylistic)
as well as the later initialization attempt.


>From cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <address@hidden>
Date: Sun, 18 Mar 2012 18:39:14 +0100
Subject: [PATCH] git-version-gen: don't let "prefix" envvar cause trouble

* build-aux/git-version-gen (prefix): Initialize properly,
so as not to use a value specified via the environment.
Details here: http://thread.gmane.org/gmane.comp.gnu.parted.bugs/10810
---
 ChangeLog                 |    7 +++++++
 build-aux/git-version-gen |    5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 128acda..d2370a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-18  Andreas Oberritter  <address@hidden>
+
+       git-version-gen: don't let "prefix" envvar cause trouble
+       * build-aux/git-version-gen (prefix): Initialize properly,
+       so as not to use a value specified via the environment.
+       Details here: http://thread.gmane.org/gmane.comp.gnu.parted.bugs/10810
+
 2012-03-16  Paul Eggert  <address@hidden>

        regex: diagnose too-large repeat counts in EREs
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index d5542a2..0fa9063 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-03-18.17; # UTC

 # Copyright (C) 2007-2012 Free Software Foundation, Inc.
 #
@@ -92,6 +92,8 @@ Options:

 Running without arguments will suffice in most cases."

+prefix=v
+
 while test $# -gt 0; do
   case $1 in
     --help) echo "$usage"; exit 0;;
@@ -120,7 +122,6 @@ if test -z "$tarball_version_file"; then
 fi

 tag_sed_script="${tag_sed_script:-s/x/x/}"
-prefix="${prefix:-v}"

 nl='
 '
--
1.7.10.rc1.23.g16a10