summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-10-13 07:14:58 +0000
committerMichał Górny <mgorny@gentoo.org>2013-10-13 07:14:58 +0000
commit75f10abe796b17537e98750e029863d93e45dbe9 (patch)
tree9a7f5612b20042f1e36b4257a93b40b5f8543e37 /eclass
parentFix dirname(3) call in writeout function, bug 487758. (diff)
downloadgentoo-2-75f10abe796b17537e98750e029863d93e45dbe9.tar.gz
gentoo-2-75f10abe796b17537e98750e029863d93e45dbe9.tar.bz2
gentoo-2-75f10abe796b17537e98750e029863d93e45dbe9.zip
Respect EVCS_OFFLINE in git-r3_fetch.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/git-r3.eclass6
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 37f442a7b977..38acc2f23d83 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1020 2013/10/12 15:12:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1021 2013/10/13 07:14:58 mgorny Exp $
+
+ 13 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
+ Respect EVCS_OFFLINE in git-r3_fetch.
12 Oct 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
Use readme.gentoo.eclass (bug #457594).
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index a091b9f7c3de..09c239dbdcda 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.15 2013/10/09 17:14:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.16 2013/10/13 07:14:58 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -385,6 +385,8 @@ _git-r3_smart_fetch() {
git-r3_fetch() {
debug-print-function ${FUNCNAME} "$@"
+ [[ ${EVCS_OFFLINE} ]] && return
+
local repos
if [[ ${1} ]]; then
repos=( ${1} )
@@ -695,8 +697,6 @@ git-r3_peek_remote_ref() {
git-r3_src_fetch() {
debug-print-function ${FUNCNAME} "$@"
- [[ ${EVCS_OFFLINE} ]] && return
-
if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then
ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider"
ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use"