Changeset 4574

Timestamp:

07/09/09 12:51:05 (7 months ago)

Author:

jmoore

Message:

ticket:1402 - check_java added to java.py

This should actually be taken care of by unifying all our
uses of subprocess into a single module which catches the
exception on subprocess.Popen() and displays the actual
command-line which was used.

Files:

• trunk/components/tools/OmeroPy/src/omero/java.py (modified) (3 diffs)

trunk/components/tools/OmeroPy/src/omero/java.py

@@ -9 +9 @@
 import platform
 import subprocess
+import exceptions
+import logging
+
 
 DEFAULT_DEBUG = "-Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"
+
+def check_java(command):
+    try:
+        p = subprocess.Popen([command[0],"-version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std = p.communicate()
+        rc = p.wait()
+        if rc == 0:
+            return
+    except:
+        pass # Falls through to raise
+
+    raise exceptions.Exception("Java could not be found. (Executable=%s)" % command[0])
 
 def makeVar(key, env):
@@ -81 +96 @@
     """
     command = cmd(args, java, xargs, chdir, debug, debug_string)
+    check_java(command)
     if use_exec:
         env = os.environ
@@ -108 +124 @@
     """
     command = cmd(args, java, xargs, chdir, debug, debug_string)
+    check_java(command)
     if not chdir:
         chdir = os.getcwd()