Skip to content

Commit 352c931

Browse files
committed
Fix url separator and properly inject downloader
1 parent 6f11ee9 commit 352c931

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/fpm/dependency.f90

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ subroutine resolve_dependency(self, dependency, root, error)
451451
character(len=:), allocatable :: manifest, proj_dir, revision
452452
type(fpm_global_settings) :: global_settings
453453
logical :: fetch
454+
type(downloader_t) :: downloader
454455

455456
if (dependency%done) return
456457

@@ -468,7 +469,7 @@ subroutine resolve_dependency(self, dependency, root, error)
468469
else
469470
call get_global_settings(global_settings, error)
470471
if (allocated(error)) return
471-
call dependency%get_from_registry(proj_dir, global_settings, error)
472+
call dependency%get_from_registry(proj_dir, global_settings, error, downloader)
472473
if (allocated(error)) return
473474
end if
474475

@@ -513,7 +514,7 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
513514
type(error_t), allocatable, intent(out) :: error
514515

515516
!> Downloader instance.
516-
class(downloader_t), optional, intent(in) :: downloader
517+
class(downloader_t), intent(in) :: downloader
517518

518519
character(:), allocatable :: cache_path, target_url, tmp_file, tmp_path
519520
type(version_t) :: version
@@ -653,7 +654,7 @@ subroutine check_and_read_pkg_data(json, node, download_url, version, error)
653654
call fatal_error(error, "Failed to read download url for '"//join_path(node%namespace, node%name)//"'."); return
654655
end if
655656

656-
download_url = official_registry_base_url//download_url
657+
download_url = official_registry_base_url//'/'//download_url
657658

658659
if (.not. q%has_key('version')) then
659660
call fatal_error(error, "Failed to download '"//join_path(node%namespace, node%name)//"': No version found."); return

0 commit comments

Comments
 (0)