summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-10-09 17:14:07 +0000
committerMichał Górny <mgorny@gentoo.org>2013-10-09 17:14:07 +0000
commit3d700083d3ca4311f1dc259b916a88d2a7b6f5f5 (patch)
tree61892a32c8fa3a676ca6368d73b29c45635a5c4e /eclass/git-r3.eclass
parentStable for sparc, wrt bug #386335 (diff)
downloadgentoo-2-3d700083d3ca4311f1dc259b916a88d2a7b6f5f5.tar.gz
gentoo-2-3d700083d3ca4311f1dc259b916a88d2a7b6f5f5.tar.bz2
gentoo-2-3d700083d3ca4311f1dc259b916a88d2a7b6f5f5.zip
Skip submodules that have update=none specified in config. Fixes bug #487262.
Diffstat (limited to 'eclass/git-r3.eclass')
-rw-r--r--eclass/git-r3.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index cd0b5fa98c46..a091b9f7c3de 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.14 2013/10/08 11:19:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.15 2013/10/09 17:14:07 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -252,6 +252,11 @@ _git-r3_set_submodules() {
l=${l#submodule.}
local subname=${l%%.url=*}
+ # skip modules that have 'update = none', bug #487262.
+ local upd=$(echo "${data}" | git config -f /dev/fd/0 \
+ submodule."${subname}".update)
+ [[ ${upd} == none ]] && continue
+
submodules+=(
"${subname}"
"$(echo "${data}" | git config -f /dev/fd/0 \