diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2013-01-16 19:06:15 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2013-01-16 19:06:15 +0000 |
| commit | aca102a5ca072d2dc0e8fdd0d5907ca6d1580cfb (patch) | |
| tree | 713abf1275b19735381c1ca06c30117398ead3cf | |
| parent | Remove python.eclass traces (python now controlled by mozcoreconf-2.eclass). (diff) | |
| download | gentoo-2-aca102a5ca072d2dc0e8fdd0d5907ca6d1580cfb.tar.gz gentoo-2-aca102a5ca072d2dc0e8fdd0d5907ca6d1580cfb.tar.bz2 gentoo-2-aca102a5ca072d2dc0e8fdd0d5907ca6d1580cfb.zip | |
Be graceful if no system vm is set if trying to determine build vm from handle.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bb8528c1dc32..4a208287b167 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.621 2013/01/16 19:02:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.622 2013/01/16 19:06:15 sera Exp $ + + 16 Jan 2013; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass: + Be graceful if no system vm is set if trying to determine build vm from + handle. 16 Jan 2013; Michał Górny <mgorny@gentoo.org> mozcoreconf-2.eclass: Migrate Mozilla packages to python-any-r1 for build-time Python dep. diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 23fd20a6632d..50da444ca206 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.151 2012/07/05 20:07:47 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.152 2013/01/16 19:06:15 sera Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -2606,15 +2606,12 @@ java-pkg_build-vm-from-handle() { debug-print-function ${FUNCNAME} "$*" local vm - vm=$(java-pkg_get-current-vm) - if [[ $? != 0 ]]; then - eerror "${FUNCNAME}: Failed to get active vm" - return 1 - fi - - if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then - echo ${vm} - return 0 + vm=$(java-pkg_get-current-vm 2>/dev/null) + if [[ $? -eq 0 ]]; then + if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then + echo ${vm} + return 0 + fi fi for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |