2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/42ef1d78a2f8/ Changeset: 42ef1d78a2f8 User: dannon Date: 2013-08-06 21:57:27 Summary: Remove relpath added in pr#149 -- not needed w/ python 2.6+ Affected #: 1 file diff -r 65c255d9c0a56099261a23c7ef1eb5185481ece0 -r 42ef1d78a2f8e2466a0698ed4b5343689da4cd6f lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -665,41 +665,6 @@ print "ERROR: Unable to read builds for site file %s" %filename return build_sites -def relpath( path, start = None ): - """Return a relative version of a path""" - #modified from python 2.6.1 source code - - #version 2.6+ has it built in, we'll use the 'official' copy - if sys.version_info[:2] >= ( 2, 6 ): - if start is not None: - return os.path.relpath( path, start ) - return os.path.relpath( path ) - - #we need to initialize some local parameters - curdir = os.curdir - pardir = os.pardir - sep = os.sep - commonprefix = os.path.commonprefix - join = os.path.join - if start is None: - start = curdir - - #below is the unedited (but formated) relpath() from posixpath.py of 2.6.1 - #this will likely not function properly on non-posix systems, i.e. windows - if not path: - raise ValueError( "no path specified" ) - - start_list = os.path.abspath( start ).split( sep ) - path_list = os.path.abspath( path ).split( sep ) - - # Work out how much of the filepath is shared by start and path. - i = len( commonprefix( [ start_list, path_list ] ) ) - - rel_list = [ pardir ] * ( len( start_list )- i ) + path_list[ i: ] - if not rel_list: - return curdir - return join( *rel_list ) - def relativize_symlinks( path, start=None, followlinks=False): for root, dirs, files in os.walk( path, followlinks=followlinks ): rel_start = None https://bitbucket.org/galaxy/galaxy-central/commits/a849924d6f9d/ Changeset: a849924d6f9d Branch: extended_metadata User: dannon Date: 2013-08-06 21:58:00 Summary: Close extended_metadata branch Affected #: 0 files 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.