commit/galaxy-central: trevorw: selected_file -> repo_file
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a56b3687e778/ Changeset: a56b3687e778 User: trevorw Date: 2014-04-30 02:24:47 Summary: selected_file -> repo_file Affected #: 1 file diff -r 1e76ef6d002830675756f617b334e824abf894c4 -r a56b3687e778c308b7bf47776a4973d0a9a9040b lib/tool_shed/util/commit_util.py --- a/lib/tool_shed/util/commit_util.py +++ b/lib/tool_shed/util/commit_util.py @@ -184,10 +184,10 @@ commands.remove( repo.ui, repo, repo_file, force=True ) except Exception, e: log.debug( "Error removing files using the mercurial API, so trying a different approach, the error was: %s" % str( e )) - relative_selected_file = selected_file.split( 'repo_%d' % repository.id )[1].lstrip( '/' ) + relative_selected_file = repo_file.split( 'repo_%d' % repository.id )[1].lstrip( '/' ) repo.dirstate.remove( relative_selected_file ) repo.dirstate.write() - absolute_selected_file = os.path.abspath( selected_file ) + absolute_selected_file = os.path.abspath( repo_file ) if os.path.isdir( absolute_selected_file ): try: os.rmdir( absolute_selected_file ) @@ -451,7 +451,7 @@ if last_actions_package_altered: last_actions_elem[ last_actions_elem_package_index ] = last_actions_elem_package_elem actions_group_elem[ last_actions_index ] = last_actions_elem - else: + else: # Inspect the sub elements of last_actions_elem to locate all <repository> tags and # populate them with toolshed and changeset_revision attributes if necessary. last_actions_package_altered, altered, last_actions_elem, message = \ 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.
participants (1)
-
commits-noreply@bitbucket.org