mgorny      14/05/23 07:09:08

  Modified:             ChangeLog git-r3.eclass
  Log:
  Give an explanatory error when trying to fetch https:// with 
dev-vcs/git[-curl]. Bug #510768.

Revision  Changes    Path
1.1265               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1265&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1265&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1264&r2=1.1265

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1264
retrieving revision 1.1265
diff -u -r1.1264 -r1.1265
--- ChangeLog   22 May 2014 16:35:11 -0000      1.1264
+++ ChangeLog   23 May 2014 07:09:07 -0000      1.1265
@@ -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 <[email protected]> git-r3.eclass:
+  Give an explanatory error when trying to fetch https:// with
+  dev-vcs/git[-curl]. Bug #510768.
 
   22 May 2014; Sergei Trofimovich <[email protected]> haskell-cabal.eclass:
   cabal_chdeps() now defaults to MY_PN (autogenerated by hackport) if exists,



1.42                 eclass/git-r3.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.42&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.42&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.41&r2=1.42

Index: git-r3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- git-r3.eclass       17 Apr 2014 20:28:37 -0000      1.41
+++ git-r3.eclass       23 May 2014 07:09:07 -0000      1.42
@@ -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 @@
                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,




Reply via email to