New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.09] History import fixes #5344

Merged
merged 4 commits into from Jan 19, 2018

Conversation

Projects
None yet
4 participants
@mvdbeek
Member

mvdbeek commented Jan 19, 2018

This fixes the history import on production setups. The first two commits are backported from dev, the third commit needs to be applied to dev (this has moved to the API and won't apply cleanly).

Addresses most of #3235 (comment)

mvdbeek and others added some commits Nov 28, 2017

@@ -1,7 +1,7 @@
<tool id="__IMPORT_HISTORY__" name="Import History" version="0.1" tool_type="import_history">
<type class="ImportHistoryTool" module="galaxy.tools"/>
<action module="galaxy.tools.actions.history_imp_exp" class="ImportHistoryToolAction"/>
<command interpreter="python">unpack_tar_gz_archive.py "${ str( $__ARCHIVE_SOURCE__ ).encode( 'base64' ) }" "${ str( $__DEST_DIR__ ).encode( 'base64' ) }" --$__ARCHIVE_TYPE__ --encoded</command>
<command>python $__tool_directory__/unpack_tar_gz_archive.py '${ str( $__ARCHIVE_SOURCE__ ).encode( 'base64' ) }' '${ str( $__DEST_DIR__ ).encode( 'base64' ) }' --$__ARCHIVE_TYPE__ --encoded</command>

This comment has been minimized.

@nsoranzo

nsoranzo Jan 19, 2018

Member

Can you also add single quotes around $__tool_directory__/unpack_tar_gz_archive.py ?

This comment has been minimized.

@mvdbeek

mvdbeek Jan 19, 2018

Member

Yup, had to cherry-pick one more commit

@martenson martenson merged commit 8fa7854 into galaxyproject:release_17.09 Jan 19, 2018

6 checks passed

api test Build finished. 295 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 162 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 46 tests run, 0 skipped, 0 failed.
Details
selenium test Build finished. No test results found.
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details

@martenson martenson added this to the 18.01 milestone Jan 19, 2018

@martenson

This comment has been minimized.

Member

martenson commented Jan 19, 2018

@mvdbeek I gave it a look but am not sure what moved where, could you merge the 3rd commit forward please?

@martenson

This comment has been minimized.

Member

martenson commented Jan 19, 2018

found it, working on merging

@martenson

This comment has been minimized.

Member

martenson commented Jan 19, 2018

I think this should be it dedb1d3

@mvdbeek mvdbeek deleted the mvdbeek:history_import_fixes branch Jun 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment