Skip to content
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

import of history works even if we use symlink in database directory #4511

Merged
merged 2 commits into from Sep 5, 2017

Conversation

Projects
None yet
4 participants
@FredericBGA
Copy link
Contributor

commented Aug 29, 2017

In my database repository, tmp dir is a symlink.
Import of history failed because the real path name were not used.

@@ -122,7 +123,7 @@ def get_tag_str(tag, value):
datasets_usage_counts = {}
for dataset_attrs in datasets_attrs:
temp_dataset_file_name = \
os.path.abspath(os.path.join(archive_dir, dataset_attrs['file_name']))
os.path.realpath(os.path.abspath(os.path.join(archive_dir, dataset_attrs['file_name'])))

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Aug 29, 2017

Member

You can remove the redundant call to os.path.abspath(), which is called internally by os.path.realpath() .

@galaxybot galaxybot added the triage label Aug 29, 2017

@galaxybot galaxybot added this to the 17.09 milestone Aug 29, 2017

@jmchilton

This comment has been minimized.

Copy link
Member

commented Sep 5, 2017

Failed travis test was unrelated to the PR, I'd run the full suite but I think only one test is related (./run_tests.sh -api test/api/test_histories.py:HistoriesApiTestCase.test_import_export) - I ran it locally and it passed so I'm merged.

Thanks for the fix @FredericBGA - it looks good to me!

@jmchilton jmchilton merged commit 338b0c9 into galaxyproject:dev Sep 5, 2017

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
lgtm analysis: JavaScript No alert changes
Details

@FredericBGA FredericBGA deleted the FredericBGA:import_history_and_symlink branch Sep 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.