[libvirt] [PATCH] run bootstrap if .gnulib is not present

[Hu Tao]

On Wed, Nov 21, 2012 at 07:08:54AM -0700, Eric Blake wrote:
> On 11/09/2012 01:47 AM, Hu Tao wrote:
> > If .gnulib is deleted unexpectedly, autogen.sh will fail with message:
> > 
> > fatal: ambiguous argument '.gnulib': unknown revision or path not in the working tree.
> > Use '--' to separate paths from revisions, like this:
> > 'git <command> [<revision>...] -- [<file>...]'
> > 
> > which is actually given by git diff .gnulib, which doesn't exist.
> > 
> > In the case to run bootstrap to create .gnulib.
> > 
> > ---
> >  autogen.sh | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/autogen.sh b/autogen.sh
> > index d183397..07c58a1 100755
> > --- a/autogen.sh
> > +++ b/autogen.sh
> > @@ -62,7 +62,9 @@ bootstrap_hash()
> >  # Only run bootstrap from a git checkout, never from a tarball.
> >  if test -d .git; then
> >      curr_status=.git-module-status
> > -    t=$(bootstrap_hash; git diff .gnulib)
> > +    if test -d .gnulib; then
> > +        t=$(bootstrap_hash; git diff .gnulib)
> > +    fi
> 
> Almost.  If .gnulib doesn't exist, then you failed to initialize $t,
> which could cause problems if it is inherited from the environment or if
> you run autogen under 'set -u'.
> 
> ACK and pushed with this tweak.

Thanks!

-- 
Hu Tao