Skip to content

Commit

Permalink
import jars: use get_omero_user_cache_dir
Browse files Browse the repository at this point in the history
Currently this is the same as get_omero_userdir but this will change soon as part of ome#210 (comment)
  • Loading branch information
manics committed Jul 2, 2020
1 parent f713d6c commit 4c68c92
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/omero/plugins/import.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

from omero.cli import BaseControl, CLI
import omero.java
from omero.util import get_omero_userdir
from omero.util import get_omero_user_cache_dir
from omero_ext.argparse import SUPPRESS
from omero_ext.path import path

Expand Down Expand Up @@ -545,7 +545,7 @@ def importer(self, args):
self.do_import(command_args, xargs)

def _userdir_jars(self, parentonly=False):
user_jars = get_omero_userdir() / 'jars'
user_jars = get_omero_user_cache_dir() / 'jars'
# Use this file instead of a symlink so it works on all platform
omero_java_txt = user_jars / 'OMERO.java.txt'
if parentonly:
Expand Down
5 changes: 5 additions & 0 deletions src/omero/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,11 @@ def get_omero_userdir():
return old_div(path.path(get_user_dir()), "omero")


def get_omero_user_cache_dir():
"""Returns the OMERO user cache directory"""
return get_omero_userdir()


def get_user_dir():
exceptions_to_handle = (ImportError)
try:
Expand Down

0 comments on commit 4c68c92

Please sign in to comment.