Skip to content

Commit

Permalink
replace urljoin with spack.util.url.join
Browse files Browse the repository at this point in the history
  • Loading branch information
rfbgo committed Mar 20, 2024
1 parent 974372f commit 8ab62ca
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/ramble/ramble/cmd/deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import llnl.util.filesystem as fs

import spack.util.spack_json as sjson
import spack.util.url as surl

import ramble.cmd
import ramble.cmd.common.arguments
Expand Down Expand Up @@ -106,9 +107,9 @@ def pull_file(src, dest):

with ws.write_transaction():
# Fetch deployment index first:
push_cls = ramble.pipeline.PublishDeploymentPipeline
push_cls = ramble.pipeline.PushDeploymentPipeline

remote_index_path = urllib.parse.urljoin(
remote_index_path = surl.join(
args.deployment_path, ramble.pipeline.PushDeploymentPipeline.index_filename
)
local_index_path = \
Expand All @@ -120,7 +121,7 @@ def pull_file(src, dest):
index_data = sjson.load(f)

for file in index_data[push_cls.index_namespace]:
src = urllib.parse.urljoin(args.deployment_path, file)
src = surl.join(args.deployment_path, file)
dest = os.path.join(ws.root, file)
if os.path.exists(dest):
fs.force_remove(dest)
Expand Down

0 comments on commit 8ab62ca

Please sign in to comment.