| 1 |
mgorny 14/05/23 07:09:08 |
| 2 |
|
| 3 |
Modified: ChangeLog git-r3.eclass |
| 4 |
Log: |
| 5 |
Give an explanatory error when trying to fetch https:// with dev-vcs/git[-curl]. Bug #510768. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1265 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1265&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1265&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1264&r2=1.1265 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1264 |
| 18 |
retrieving revision 1.1265 |
| 19 |
diff -u -r1.1264 -r1.1265 |
| 20 |
--- ChangeLog 22 May 2014 16:35:11 -0000 1.1264 |
| 21 |
+++ ChangeLog 23 May 2014 07:09:07 -0000 1.1265 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1264 2014/05/22 16:35:11 slyfox Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1265 2014/05/23 07:09:07 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 23 May 2014; Michał Górny <mgorny@g.o> git-r3.eclass: |
| 29 |
+ Give an explanatory error when trying to fetch https:// with |
| 30 |
+ dev-vcs/git[-curl]. Bug #510768. |
| 31 |
|
| 32 |
22 May 2014; Sergei Trofimovich <slyfox@g.o> haskell-cabal.eclass: |
| 33 |
cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists, |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.42 eclass/git-r3.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.42&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.42&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.41&r2=1.42 |
| 42 |
|
| 43 |
Index: git-r3.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v |
| 46 |
retrieving revision 1.41 |
| 47 |
retrieving revision 1.42 |
| 48 |
diff -u -r1.41 -r1.42 |
| 49 |
--- git-r3.eclass 17 Apr 2014 20:28:37 -0000 1.41 |
| 50 |
+++ git-r3.eclass 23 May 2014 07:09:07 -0000 1.42 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.41 2014/04/17 20:28:37 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.42 2014/05/23 07:09:07 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: git-r3.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -470,6 +470,15 @@ |
| 60 |
local fetch_command=( git fetch "${r}" ) |
| 61 |
local clone_type=${EGIT_CLONE_TYPE} |
| 62 |
|
| 63 |
+ if [[ ${r} == https://* ]] && ! has_version 'dev-vcs/git[curl]'; then |
| 64 |
+ eerror "git-r3: fetching from https:// requested. In order to support https," |
| 65 |
+ eerror "dev-vcs/git needs to be built with USE=curl. Example solution:" |
| 66 |
+ eerror |
| 67 |
+ eerror " echo dev-vcs/git curl >> /etc/portage/package.use" |
| 68 |
+ eerror " emerge -1v dev-vcs/git" |
| 69 |
+ die "dev-vcs/git built with USE=curl required." |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
if [[ ${r} == https://code.google.com/* ]]; then |
| 73 |
# Google Code has special magic on top of git that: |
| 74 |
# 1) can't handle shallow clones at all, |
Archives