diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-23 07:09:07 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-23 07:09:07 +0000 |
| commit | ad347fc22f0522ed2973c5060372bdd007d4540b (patch) | |
| tree | 008953c26f1906249530e02f2c1a7a541bb4001f /eclass | |
| parent | Whitespace. (diff) | |
| download | gentoo-2-ad347fc22f0522ed2973c5060372bdd007d4540b.tar.gz gentoo-2-ad347fc22f0522ed2973c5060372bdd007d4540b.tar.bz2 gentoo-2-ad347fc22f0522ed2973c5060372bdd007d4540b.zip | |
Give an explanatory error when trying to fetch https:// with dev-vcs/git[-curl]. Bug #510768.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2429d9b479d5..9e21aa1c36f3 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.1264 2014/05/22 16:35:11 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1265 2014/05/23 07:09:07 mgorny Exp $ + + 23 May 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Give an explanatory error when trying to fetch https:// with + dev-vcs/git[-curl]. Bug #510768. 22 May 2014; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass: cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists, diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 1154721c1324..563e5d0e7a97 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.41 2014/04/17 20:28:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.42 2014/05/23 07:09:07 mgorny Exp $ # @ECLASS: git-r3.eclass # @MAINTAINER: @@ -470,6 +470,15 @@ 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 + 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 + eerror " echo dev-vcs/git curl >> /etc/portage/package.use" + eerror " emerge -1v dev-vcs/git" + die "dev-vcs/git built with USE=curl required." + fi + if [[ ${r} == https://code.google.com/* ]]; then # Google Code has special magic on top of git that: # 1) can't handle shallow clones at all, |