Skip to content

Commit

Permalink
OmeroBuild : Printing errs when detecting OMERO_BUILD (i.e. hudson)
Browse files Browse the repository at this point in the history
git-svn-id: file:///home/svn/omero/trunk@5240 05709c45-44f0-0310-885b-81a1db45b4a6
  • Loading branch information
joshmoore committed Oct 6, 2009
1 parent f583399 commit 4e26c54
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4e26c54

Please sign in to comment.