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

Merge pull request #604 from alaviss/no-pkglist

Browse source 
config: don't error out if no package list found
This commit is contained in:
Dominik Picheta 2019-01-20 08:23:12 -08:00 • committed by GitHub
commit e60ab12549
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/nimblepkg/config.nim
View file

@ -68,11 +68,12 @@ proc parseConfig*(): Config =
var e = next(p) var e = next(p)
case e.kind case e.kind
of cfgEof: of cfgEof:
if currentPackageList.urls.len == 0 and currentPackageList.path == "": if currentSection.len > 0:
raise newException(NimbleError, "Package list '$1' requires either url or path" % currentPackageList.name) if currentPackageList.urls.len == 0 and currentPackageList.path == "":
if currentPackageList.urls.len > 0 and currentPackageList.path != "": raise newException(NimbleError, "Package list '$1' requires either url or path" % currentPackageList.name)
raise newException(NimbleError, "Attempted to specify `url` and `path` for the same package list '$1'" % currentPackageList.name) if currentPackageList.urls.len > 0 and currentPackageList.path != "":
addCurrentPkgList(result, currentPackageList) raise newException(NimbleError, "Attempted to specify `url` and `path` for the same package list '$1'" % currentPackageList.name)
addCurrentPkgList(result, currentPackageList)
break break
of cfgSectionStart: of cfgSectionStart:
addCurrentPkgList(result, currentPackageList) addCurrentPkgList(result, currentPackageList)