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.

Sign up for GitHub

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

Always emit publish event for symlinks on resume #4790

Merged
merged 3 commits into from
Mar 7, 2024
Merged

Always emit publish event for symlinks on resume #4790

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
905c5c2
Always emit publish event for symlinks on resume
bentsherman Feb 29, 2024
6de04b9
Update modules/nextflow/src/main/groovy/nextflow/processor/PublishDir…
bentsherman Mar 5, 2024
66b6b86
Minor comment [ci skip]
pditommaso Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions modules/nextflow/src/main/groovy/nextflow/processor/PublishDir.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,14 +385,13 @@ class PublishDir {
processFileImpl(source, destination)
}
catch( FileAlreadyExistsException e ) {
if( checkIsSameRealPath(source, destination) )
return
final sameRealPath = checkIsSameRealPath(source, destination)
bentsherman marked this conversation as resolved.
Show resolved Hide resolved
// make sure destination and source does not overlap
// see https://github.com/nextflow-io/nextflow/issues/2177
if( checkSourcePathConflicts(destination))
if( !sameRealPath && checkSourcePathConflicts(destination))
return

if( overwrite ) {
if( !sameRealPath && overwrite ) {
FileHelper.deletePath(destination)
processFileImpl(source, destination)
}
Expand Down
Loading