diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-10-14 20:30:00 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-10-14 20:30:00 +0000 |
| commit | cf8d9856dbb1846dda29bc1d294bc61f696bca9f (patch) | |
| tree | c826d5849c180b55ee2864b4dafbd3083599a76a /eclass | |
| parent | Switch to git-r3. Add PYTHON_USEDEP on portage. (diff) | |
| download | gentoo-2-cf8d9856dbb1846dda29bc1d294bc61f696bca9f.tar.gz gentoo-2-cf8d9856dbb1846dda29bc1d294bc61f696bca9f.tar.bz2 gentoo-2-cf8d9856dbb1846dda29bc1d294bc61f696bca9f.zip | |
Fix over-use of ||die.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b4cc055bdd5f..7a800406c582 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.1024 2013/10/14 17:29:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1025 2013/10/14 20:30:00 mgorny Exp $ + + 14 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Fix over-use of ||die. 14 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: Add qtbearer to nolibx11_pkgs diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 32300387493d..743619fa2a32 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.17 2013/10/14 13:32:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.18 2013/10/14 20:30:00 mgorny Exp $ # @ECLASS: git-r3.eclass # @MAINTAINER: @@ -254,7 +254,7 @@ _git-r3_set_submodules() { # skip modules that have 'update = none', bug #487262. local upd=$(echo "${data}" | git config -f /dev/fd/0 \ - submodule."${subname}".update || die) + submodule."${subname}".update) [[ ${upd} == none ]] && continue submodules+=( |