@@ -524,10 +524,14 @@ subroutine resolve_dependencies(self, root, error)
524
524
! > Error handling
525
525
type (error_t), allocatable , intent (out ) :: error
526
526
527
+ type (fpm_global_settings) :: global_settings
527
528
integer :: ii
528
529
530
+ call get_global_settings(global_settings, error)
531
+ if (allocated (error)) return
532
+
529
533
do ii = 1 , self% ndep
530
- call self% resolve(self% dep(ii), root, error)
534
+ call self% resolve(self% dep(ii), global_settings, root, error)
531
535
if (allocated (error)) exit
532
536
end do
533
537
@@ -536,19 +540,20 @@ subroutine resolve_dependencies(self, root, error)
536
540
end subroutine resolve_dependencies
537
541
538
542
! > Resolve a single dependency node
539
- subroutine resolve_dependency (self , dependency , root , error )
543
+ subroutine resolve_dependency (self , dependency , global_settings , root , error )
540
544
! > Instance of the dependency tree
541
545
class(dependency_tree_t), intent (inout ) :: self
542
546
! > Dependency configuration to add
543
547
type (dependency_node_t), intent (inout ) :: dependency
548
+ ! > Global configuration settings.
549
+ type (fpm_global_settings), intent (in ) :: global_settings
544
550
! > Current installation prefix
545
551
character (len=* ), intent (in ) :: root
546
552
! > Error handling
547
553
type (error_t), allocatable , intent (out ) :: error
548
554
549
555
type (package_config_t) :: package
550
556
character (len= :), allocatable :: manifest, proj_dir, revision
551
- type (fpm_global_settings) :: global_settings
552
557
logical :: fetch
553
558
554
559
if (dependency% done) return
@@ -565,8 +570,6 @@ subroutine resolve_dependency(self, dependency, root, error)
565
570
if (allocated (error)) return
566
571
end if
567
572
else
568
- call get_global_settings(global_settings, error)
569
- if (allocated (error)) return
570
573
call dependency% get_from_registry(proj_dir, global_settings, error)
571
574
if (allocated (error)) return
572
575
end if
0 commit comments