Skip to content

Commit 81816bf

Browse files
authored
Include special versions in list action (#1415)
1 parent cea7631 commit 81816bf

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/nimble.nim

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ proc buildFromDir(pkgInfo: PackageInfo, paths: HashSet[seq[string]],
412412
pkgInfo.getNimBin(options).quoteShell, pkgInfo.backend, if options.noColor: "off" else: "on", join(args, " "),
413413
outputOpt, input.quoteShell]
414414
try:
415+
display("Executing", cmd, priority = DebugPriority)
415416
doCmd(cmd)
416417
binariesBuilt.inc()
417418
except CatchableError as error:
@@ -1156,7 +1157,7 @@ proc listNimBinaries(options: Options) =
11561157

11571158
proc listInstalled(options: Options) =
11581159
type
1159-
VersionChecksumTuple = tuple[version: Version, checksum: Sha1Hash]
1160+
VersionChecksumTuple = tuple[version: Version, checksum: Sha1Hash, special: seq[string], path: string]
11601161
var vers: OrderedTable[string, seq[VersionChecksumTuple]]
11611162
let pkgs = getInstalledPkgsMin(options.getPkgsDir(), options)
11621163
for pkg in pkgs:
@@ -1166,7 +1167,7 @@ proc listInstalled(options: Options) =
11661167
pChecksum = pkg.basicInfo.checksum
11671168
if not vers.hasKey(pName): vers[pName] = @[]
11681169
var s = vers[pName]
1169-
add(s, (pVersion, pChecksum))
1170+
add(s, (pVersion, pChecksum, pkg.metadata.specialVersions.toSeq().map(v => $v), pkg.getRealDir()))
11701171
vers[pName] = s
11711172

11721173
vers.sort(proc (a, b: (string, seq[VersionChecksumTuple])): int =
@@ -1187,6 +1188,11 @@ proc listInstalled(options: Options) =
11871188
displayFormatted(Success, "@", $item.version)
11881189
displayFormatted(Hint, " ")
11891190
displayFormatted(Details, fmt"({item.checksum})")
1191+
if item.special.len > 1:
1192+
displayFormatted(Hint, " ")
1193+
displayFormatted(Details, fmt"""[{item.special.join(", ")}]""")
1194+
displayFormatted(Hint, " ")
1195+
displayFormatted(Details, fmt"({item.path})")
11901196
displayFormatted(Hint, "\n")
11911197
# " [" & vers[k].join(", ") & "]"
11921198

0 commit comments

Comments
 (0)