From 4e26c54da045cff00f9125f4e3c1927082ccf896 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 6 Oct 2009 07:47:32 +0000 Subject: [PATCH] OmeroBuild : Printing errs when detecting OMERO_BUILD (i.e. hudson) git-svn-id: file:///home/svn/omero/trunk@5240 05709c45-44f0-0310-885b-81a1db45b4a6 --- build.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build.py b/build.py index e6e75b7de3c..8fbcda6fa25 100755 --- a/build.py +++ b/build.py @@ -75,13 +75,15 @@ def choose_omero_version(): """ try: omero_build = os.environ["OMERO_BUILD"] - command = [ find_java() ] - command.extend( calculate_memory_args() ) - command.extend(["omero","-q","version"]) - p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - omero_version,err = p.communicate() - omero_version = omero_version.split()[1] - return [ "-Domero.version=%s-%s" % (omero_version, omero_build) ] + command = [ find_java(), "omero","-q","version" ] + try: + p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + omero_version,err = p.communicate() + omero_version = omero_version.split()[1] + return [ "-Domero.version=%s-%s" % (omero_version, omero_build) ] + except: + print "Error getting version for OMERO_BUILD=%s" % omero_build + print err except KeyError, ke: return [] # Use default