1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/fbf4b5ab17a9/ Changeset: fbf4b5ab17a9 User: jmchilton Date: 2014-06-24 04:55:11 Summary: Make galaxy.util.in_directory slightly more generic to match Pulsar's variant. Fixes failing unit test in just added code. Affected #: 1 file diff -r 566388d623749dad4259ea04cf44a5d858a56671 -r fbf4b5ab17a90ec7b0deac658ead6a99b9a6ca76 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -417,17 +417,16 @@ return slug_base -def in_directory( file, directory ): +def in_directory( file, directory, local_path_module=os.path ): """ Return true, if the common prefix of both is equal to directory e.g. /a/b/c/d.rst and directory is /a/b, the common prefix is /a/b """ # Make both absolute. - directory = os.path.abspath( directory ) - file = os.path.abspath( file ) - - return os.path.commonprefix( [ file, directory ] ) == directory + directory = local_path_module.abspath(directory) + file = local_path_module.abspath(file) + return local_path_module.commonprefix([file, directory]) == directory def merge_sorted_iterables( operator, *iterables ): Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.