[libvirt] [PATCH] autogen.sh: Correctly detect .git as a file

Eric Blake eblake at redhat.com
Thu Aug 29 11:44:17 UTC 2013


On 08/29/2013 05:22 AM, Michal Privoznik wrote:
> One of my previous patches 5cfe0d37cd0be tried to handle the case when
> libvirt is a submodule of another project. In that case, the .git is
> just a link to the parent .git directory (which the autogen.sh script
> didn't count on). The fix was missing 'test' though.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  autogen.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ACK.

> 
> diff --git a/autogen.sh b/autogen.sh
> index f7c2022..5aa1990 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 || -f .git; then
> +if test -d .git || test -f .git; then
>      curr_status=.git-module-status t=
>      if test "$no_git"; then
>          t=no-git
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20130829/0976884d/attachment-0001.sig>


More information about the libvir-list mailing list