Skip to content

Commit 33561d6

Browse files
committed
Fix failing tests
1 parent 81fa25a commit 33561d6

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/fpm/manifest/dependency.f90

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -411,18 +411,24 @@ logical function dependency_is_same(this,that)
411411
select type (other=>that)
412412
type is (dependency_config_t)
413413

414-
if (.not. allocated(this%name) .or. .not. allocated(other%name)) return
415-
if (.not.(this%name==other%name)) return
416-
if (.not. allocated(this%path) .or. .not. allocated(other%path)) return
417-
if (.not.(this%path==other%path)) return
418-
if (.not. allocated(this%namespace) .or. .not. allocated(other%namespace)) return
419-
if (.not.(this%namespace==other%namespace)) return
420-
if (.not.(allocated(this%requested_version).eqv.allocated(other%requested_version))) return
414+
if (allocated(this%name).neqv.allocated(other%name)) return
415+
if (allocated(this%name)) then
416+
if (.not.(this%name==other%name)) return
417+
endif
418+
if (allocated(this%path).neqv.allocated(other%path)) return
419+
if (allocated(this%path)) then
420+
if (.not.(this%path==other%path)) return
421+
endif
422+
if (allocated(this%namespace).neqv.allocated(other%namespace)) return
423+
if (allocated(this%namespace)) then
424+
if (.not.(this%namespace==other%namespace)) return
425+
endif
426+
if (allocated(this%requested_version).neqv.allocated(other%requested_version)) return
421427
if (allocated(this%requested_version)) then
422428
if (.not.(this%requested_version==other%requested_version)) return
423429
endif
424430

425-
if (.not.(allocated(this%git).eqv.allocated(other%git))) return
431+
if ((allocated(this%git).neqv.allocated(other%git))) return
426432
if (allocated(this%git)) then
427433
if (.not.(this%git==other%git)) return
428434
endif

0 commit comments

Comments
 (0)