From: "Ralph Sennhauser (sera)" <sera@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
Date: Wed, 16 Jan 2013 19:06:15 +0000 (UTC) [thread overview]
Message-ID: <20130116190615.408832171D@flycatcher.gentoo.org> (raw)
sera 13/01/16 19:06:15
Modified: ChangeLog java-utils-2.eclass
Log:
Be graceful if no system vm is set if trying to determine build vm from handle.
Revision Changes Path
1.622 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.622&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.622&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.621&r2=1.622
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- ChangeLog 16 Jan 2013 19:02:10 -0000 1.621
+++ ChangeLog 16 Jan 2013 19:06:15 -0000 1.622
@@ -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.
1.152 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.151&r2=1.152
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- java-utils-2.eclass 5 Jul 2012 20:07:47 -0000 1.151
+++ java-utils-2.eclass 16 Jan 2013 19:06:15 -0000 1.152
@@ -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 @@
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
next reply other threads:[~2013-01-16 19:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 19:06 Ralph Sennhauser (sera) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-02 23:12 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass James Le Cuirot (chewi)
2015-07-31 7:56 Patrice Clement (monsieurp)
2015-07-30 22:17 James Le Cuirot (chewi)
2015-07-22 9:20 Patrice Clement (monsieurp)
2015-06-28 13:33 James Le Cuirot (chewi)
2015-06-19 14:11 James Le Cuirot (chewi)
2015-06-15 21:09 James Le Cuirot (chewi)
2015-05-24 22:44 James Le Cuirot (chewi)
2015-05-02 20:23 James Le Cuirot (chewi)
2015-04-14 14:08 James Le Cuirot (chewi)
2014-04-09 21:55 Tim Harder (radhermit)
2013-10-06 14:37 Vlastimil Babka (caster)
2013-08-27 5:32 Tim Harder (radhermit)
2013-04-17 18:01 Ralph Sennhauser (sera)
2012-07-05 20:07 Ralph Sennhauser (sera)
2012-03-13 10:05 Ralph Sennhauser (sera)
2011-12-13 14:42 Ralph Sennhauser (sera)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130116190615.408832171D@flycatcher.gentoo.org \
--to=sera@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox