Slight dependency error message tweak.

This commit is contained in:
Dominik Picheta 2011-01-28 11:39:02 +00:00
commit 6da098b46c
2 changed files with 19 additions and 2 deletions

View file

@ -30,8 +30,8 @@ proc dependExists(name: string, verRange: PVersionRange): Bool =
if name == "nimrod":
var nimVer = getNimVersion()
if not withinRange(newVersion(nimVer), verRange):
raise newException(EInstall, "Nimrod version(" &
nimVer & ") doesn't satisfy dependency")
raise newException(EInstall, "Nimrod version doesn't satisfy dependency: " &
nimVer & " " & $verRange)
else: return True
else:
for kind, path in walkDir(getBabelDir() / "lib"):

View file

@ -121,6 +121,23 @@ proc parseVersionRange*(s: string): PVersionRange =
raise newException(EParseVersion, "Unexpected char in version range: " & s[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:
assert(newVersion("1.0") < newVersion("1.4"))
assert(newVersion("1.0.1") > newVersion("1.0"))