summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-20 11:40:28 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-20 11:40:28 +0000
commit5100a34e75ceee7fda571f4fd57f7a1f18e81c01 (patch)
tree0d573768d3efad2e5f9fae8009d935093f1b4c54
parentVersion bump. Fix for futexes broken by 042stab090.3. (diff)
downloadgentoo-2-5100a34e75ceee7fda571f4fd57f7a1f18e81c01.tar.gz
gentoo-2-5100a34e75ceee7fda571f4fd57f7a1f18e81c01.tar.bz2
gentoo-2-5100a34e75ceee7fda571f4fd57f7a1f18e81c01.zip
Fix typo in submodule fetching, reported by Hans Vercammen.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/git-r3.eclass4
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d37370b82869..d8f3d7d6f3a9 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1295 2014/06/20 00:03:33 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1296 2014/06/20 11:40:28 mgorny Exp $
+
+ 20 Jun 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
+ Fix typo in submodule fetching, reported by Hans Vercammen.
19 Jun 2014; Brian Evans <grknight@gentoo.org> mysql-v2.eclass, mysql-cmake.eclass:
Sync with mysql overlay.
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 01937248d617..99b2ffe9a2d1 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -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.43 2014/06/01 22:07:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.44 2014/06/20 11:40:28 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -825,7 +825,7 @@ git-r3_checkout() {
local subrepos
_git-r3_set_subrepos "${url}" "${repos[@]}"
- git-r3_checkout "${url}" "${out_dir}/${path}" \
+ git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \
"${local_id}/${subname}"
submodules=( "${submodules[@]:3}" ) # shift