Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 4bfa2f62fb1b04d8e05e5edca17fab319bbc4f8b https://github.com/galaxyproject/galaxy/commit/4bfa2f62fb1b04d8e05e5edca17fa... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py
Log Message: ----------- Fix for py34-lint
Commit: 89890d4f60452a9fc55d924fd960f4bd72ddbb12 https://github.com/galaxyproject/galaxy/commit/89890d4f60452a9fc55d924fd960f... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
Log Message: ----------- Fix move_directory_files tool dependency action when destination is not empty
Historically this action moves the contents of the source directory to the destination directory. Commit d38936bd8d9b3612dc0718859067e299651e6c86 broke the install when e.g. the destination is $INSTALL_DIR, which is created by Galaxy and is not empty (contains INSTALLATION.log after first action).
Commit: 67c4df712a0d8b0abc9eb93f2f4fa145c5843b2c https://github.com/galaxyproject/galaxy/commit/67c4df712a0d8b0abc9eb93f2f4fa... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
Log Message: ----------- Merge pull request #2522 from nsoranzo/release_16.01_fix_for_2479
[16.01] Fix move_directory_files tool dependency action when destination is not empty
Commit: 15a4734aed73aabaf70f0da8a1eb54adeb75553b https://github.com/galaxyproject/galaxy/commit/15a4734aed73aabaf70f0da8a1eb5... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
Log Message: ----------- Merge branch 'release_16.01' into release_16.04
Compare: https://github.com/galaxyproject/galaxy/compare/dad193e3c081...15a4734aed73