Skip to content

Commit d644d4f

Browse files
jmgomezjmgomez
andauthored
Fixes #1419 (#1426)
Co-authored-by: jmgomez <[email protected]>
1 parent 513263e commit d644d4f

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/nimblepkg/nimblesat.nim

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,20 @@ proc getAllNimReleases(options: Options): seq[PackageMinimalInfo] =
549549
if options.nimBin.isSome:
550550
result.addUnique PackageMinimalInfo(name: "nim", version: options.nimBin.get.version)
551551

552-
proc getTaggedVersions*(repoDir, pkgName: string, options: Options): Option[TaggedPackageVersions] =
553-
var file: string
552+
proc getCacheFileName(repoDir, pkgName: string, options: Options): string =
553+
# return options.getNimbleDir / "pkgcache" / "tagged" / "test" & ".json"
554554
if options.localDeps:
555-
file = options.getNimbleDir / "pkgcache" / "tagged" / pkgName & ".json"
556-
else:
557-
file = repoDir / TaggedVersionsFileName
555+
var pkgName =
556+
if pkgName.isUrl:
557+
pkgName.getDownloadDirName(VersionRange(kind: verAny), notSetSha1Hash)
558+
else:
559+
pkgName
560+
return options.getNimbleDir / "pkgcache" / "tagged" / pkgName & ".json"
561+
else:
562+
return repoDir / TaggedVersionsFileName
563+
564+
proc getTaggedVersions*(repoDir, pkgName: string, options: Options): Option[TaggedPackageVersions] =
565+
let file = getCacheFileName(repoDir, pkgName, options)
558566
if file.fileExists:
559567
try:
560568
let taggedVersions = file.readFile.parseJson().to(TaggedPackageVersions)
@@ -568,11 +576,7 @@ proc getTaggedVersions*(repoDir, pkgName: string, options: Options): Option[Tagg
568576
return none(TaggedPackageVersions)
569577

570578
proc saveTaggedVersions*(repoDir, pkgName: string, taggedVersions: TaggedPackageVersions, options: Options) =
571-
var file: string
572-
if options.localDeps:
573-
file = options.getNimbleDir / "pkgcache" / "tagged" / pkgName & ".json"
574-
else:
575-
file = repoDir / TaggedVersionsFileName
579+
let file = getCacheFileName(repoDir, pkgName, options)
576580
try:
577581
createDir(file.parentDir)
578582
file.writeFile((taggedVersions.toJson()).pretty)

0 commit comments

Comments
 (0)