[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] autogen: Handle case when libvirt's submodule



On 19.07.2013 09:14, Michal Privoznik wrote:
> Currently, in the autogen.sh script we check whether .git is an existing
> directory in which case bootstrap is run. However, if libvirt is a
> submodule, then the .git is just a file (with reference to the topmost
> .git directory). However, our submodule routines work well. So there's
> no real reason why we should prohibit users to build libvirt from
> submodule.
> ---
>  autogen.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/autogen.sh b/autogen.sh
> index 42e5608..bfaa058 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -64,7 +64,7 @@ bootstrap_hash()
>  # like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates
>  # the required file po/Makevars.
>  # Only run bootstrap from a git checkout, never from a tarball.
> -if test -d .git; then
> +if test -d .git -o -f .git; then
>      curr_status=.git-module-status t=
>      if test "$no_git"; then
>          t=no-git
> 

Hit 'git send-email' before 'make syntax-check' finished. I should have
used '||' instead of '-o'. Will send v2 shortly.

Michal


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]