diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-07-28 14:12:22 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-07-28 14:12:22 +0000 |
| commit | 4fe6e73594e00a4223790ad77823c71ad22e3cca (patch) | |
| tree | 9c0afb17e9aa66b5344dbbb5ac61d30075137431 /eclass | |
| parent | Version bumps (diff) | |
| download | gentoo-2-4fe6e73594e00a4223790ad77823c71ad22e3cca.tar.gz gentoo-2-4fe6e73594e00a4223790ad77823c71ad22e3cca.tar.bz2 gentoo-2-4fe6e73594e00a4223790ad77823c71ad22e3cca.zip | |
Use ROOT=/ when checking for git features, bug #518374. Patch provided by Michael Haubenwallner.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 764fc0d94bf9..709341c96344 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1325 2014/07/25 23:18:34 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1326 2014/07/28 14:12:22 mgorny Exp $ + + 28 Jul 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Use ROOT=/ when checking for git features, bug #518374. Patch provided by + Michael Haubenwallner. 25 Jul 2014; Christoph Junghans <ottxor@gentoo.org> mercurial.eclass: Added EHG_CHECKOUT_DIR to override checkout destination diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 76b406611bc5..27a104b50a17 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.45 2014/07/07 14:41:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.46 2014/07/28 14:12:22 mgorny Exp $ # @ECLASS: git-r3.eclass # @MAINTAINER: @@ -513,7 +513,7 @@ git-r3_fetch() { local fetch_command=( git fetch "${r}" ) local clone_type=${EGIT_CLONE_TYPE} - if [[ ${r} == https://* ]] && ! has_version 'dev-vcs/git[curl]'; then + if [[ ${r} == https://* ]] && ! ROOT=/ has_version 'dev-vcs/git[curl]'; then eerror "git-r3: fetching from https:// requested. In order to support https," eerror "dev-vcs/git needs to be built with USE=curl. Example solution:" eerror |