Skip to content

Fix os independent paths #2043

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

Merged
benclifford merged 2 commits into from
May 3, 2021
Merged

Fix os independent paths #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17c652f
FIX: os independent path
vkhodygo Apr 30, 2021
08ceabc
Merge branch 'master' into os_path_fix
benclifford May 3, 2021
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
2 changes: 1 addition & 1 deletion parsl/channels/local/local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def push_file(self, source, dest_dir):
- FileCopyException : If file copy failed.
'''

local_dest = dest_dir + '/' + os.path.basename(source)
local_dest = os.path.join(dest_dir, os.path.basename(source))

# Only attempt to copy if the target dir and source dir are different
if os.path.dirname(source) != dest_dir:
Expand Down
4 changes: 2 additions & 2 deletions parsl/channels/ssh/ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def push_file(self, local_source, remote_dir):
- FileCopyException : FileCopy failed.

'''
remote_dest = remote_dir + '/' + os.path.basename(local_source)
remote_dest = os.path.join(remote_dir, os.path.basename(local_source))

try:
self.makedirs(remote_dir, exist_ok=True)
Expand Down Expand Up @@ -200,7 +200,7 @@ def pull_file(self, remote_source, local_dir):
- FileCopyException : FileCopy failed.
'''

local_dest = local_dir + '/' + os.path.basename(remote_source)
local_dest = os.path.join(local_dir, os.path.basename(remote_source))

try:
os.makedirs(local_dir)
Expand Down