jyapayne/nimble
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Raise EBabel exception instead of calling quit().

Browse source
This commit is contained in:
Dominik Picheta 2013-11-30 14:53:12 +00:00
commit b1358d7d74
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
babel.nim
View file

@ -351,9 +351,9 @@ proc build(options: TOptions) =
proc search(action: TAction) = proc search(action: TAction) =
assert action.typ == ActionSearch assert action.typ == ActionSearch
if action.search == @[]: if action.search == @[]:
quit("Please specify a search string.", QuitFailure) raise newException(EBabel, "Please specify a search string.")
if not existsFile(babelDir / "packages.json"): if not existsFile(babelDir / "packages.json"):
quit("Please run babel update.", QuitFailure) raise newException(EBabel, "Please run babel update.")
let pkgList = getPackageList(babelDir / "packages.json") let pkgList = getPackageList(babelDir / "packages.json")
var notFound = true var notFound = true
for pkg in pkgList: for pkg in pkgList:
@ -377,7 +377,7 @@ proc search(action: TAction) =
proc list = proc list =
if not existsFile(babelDir / "packages.json"): if not existsFile(babelDir / "packages.json"):
quit("Please run babel update.", QuitFailure) raise newException(EBabel, "Please run babel update.")
let pkgList = getPackageList(babelDir / "packages.json") let pkgList = getPackageList(babelDir / "packages.json")
for pkg in pkgList: for pkg in pkgList:
echoPackage(pkg) echoPackage(pkg)
@ -409,10 +409,10 @@ proc listPaths(packages: seq[String]) =
sort(installed, system.cmp[VersionAndPath], Descending) sort(installed, system.cmp[VersionAndPath], Descending)
echo installed[0].path echo installed[0].path
else: else:
echo "FAILURE: Package '" & name & "' not installed" echo "Warning: Package '" & name & "' not installed"
errors += 1 errors += 1
if errors > 0: if errors > 0:
quit("FAILURE: At least one specified package was not found", QuitFailure) raise newException(EBabel, "At least one of the specified packages was not found")
proc doAction(options: TOptions) = proc doAction(options: TOptions) =
case options.action.typ case options.action.typ