diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 7422e6e7cc7f..f21b6bf75b50 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.1014 2013/10/08 11:19:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1015 2013/10/09 17:14:07 mgorny Exp $ + + 09 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Skip submodules that have update=none specified in config. Fixes bug #487262. 08 Oct 2013; Michał Górny <mgorny@gentoo.org> git-2.eclass, git-r3.eclass: Fix git-r3 -> git-2 dependency leak, as noted in bug #487026. 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 \ |