Slight dependency error message tweak.
This commit is contained in:
parent
d984032f1e
commit
6da098b46c
2 changed files with 19 additions and 2 deletions
|
|
@ -30,8 +30,8 @@ proc dependExists(name: string, verRange: PVersionRange): Bool =
|
||||||
if name == "nimrod":
|
if name == "nimrod":
|
||||||
var nimVer = getNimVersion()
|
var nimVer = getNimVersion()
|
||||||
if not withinRange(newVersion(nimVer), verRange):
|
if not withinRange(newVersion(nimVer), verRange):
|
||||||
raise newException(EInstall, "Nimrod version(" &
|
raise newException(EInstall, "Nimrod version doesn't satisfy dependency: " &
|
||||||
nimVer & ") doesn't satisfy dependency")
|
nimVer & " " & $verRange)
|
||||||
else: return True
|
else: return True
|
||||||
else:
|
else:
|
||||||
for kind, path in walkDir(getBabelDir() / "lib"):
|
for kind, path in walkDir(getBabelDir() / "lib"):
|
||||||
|
|
|
||||||
17
version.nim
17
version.nim
|
|
@ -121,6 +121,23 @@ proc parseVersionRange*(s: string): PVersionRange =
|
||||||
raise newException(EParseVersion, "Unexpected char in version range: " & s[i])
|
raise newException(EParseVersion, "Unexpected char in version range: " & s[i])
|
||||||
inc(i)
|
inc(i)
|
||||||
|
|
||||||
|
proc `$`*(verRange: PVersionRange): String =
|
||||||
|
case verRange.kind
|
||||||
|
of verLater:
|
||||||
|
result = "> "
|
||||||
|
of verEarlier:
|
||||||
|
result = "< "
|
||||||
|
of verEqLater:
|
||||||
|
result = ">= "
|
||||||
|
of verEqEarlier:
|
||||||
|
result = "<= "
|
||||||
|
of verIntersect:
|
||||||
|
result = $verRange.verILeft & " & " & $verRange.verIRight
|
||||||
|
of verAny:
|
||||||
|
return "Any"
|
||||||
|
|
||||||
|
result.add(string(verRange.ver))
|
||||||
|
|
||||||
when isMainModule:
|
when isMainModule:
|
||||||
assert(newVersion("1.0") < newVersion("1.4"))
|
assert(newVersion("1.0") < newVersion("1.4"))
|
||||||
assert(newVersion("1.0.1") > newVersion("1.0"))
|
assert(newVersion("1.0.1") > newVersion("1.0"))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue