Fixes tests.

This commit is contained in:
Dominik Picheta 2016-12-27 13:54:54 +00:00
commit 53856db8ff
10 changed files with 14 additions and 13 deletions

View file

@ -298,11 +298,11 @@ proc processDeps(pkginfo: PackageInfo, options: Options): seq[string] =
for p in result:
let pkgInfo = getPkgInfo(p, options)
if pkgsInPath.hasKey(pkgInfo.name) and
pkgsInPath[pkgInfo.name] != pkgInfo.specialVersion:
pkgsInPath[pkgInfo.name] != pkgInfo.version:
raise newException(NimbleError,
"Cannot satisfy the dependency on $1 $2 and $1 $3" %
[pkgInfo.name, pkgInfo.specialVersion, pkgsInPath[pkgInfo.name]])
pkgsInPath[pkgInfo.name] = pkgInfo.specialVersion
[pkgInfo.name, pkgInfo.version, pkgsInPath[pkgInfo.name]])
pkgsInPath[pkgInfo.name] = pkgInfo.version
# We add the reverse deps to the JSON file here because we don't want
# them added if the above errorenous condition occurs
@ -409,7 +409,7 @@ proc installFromDir(dir: string, requestedVer: VersionRange, options: Options,
pkgInfo.specialVersion = $requestedVer.spe
# Dependencies need to be processed before the creation of the pkg dir.
result.paths = processDeps(pkginfo, depsOptions)
result.paths = processDeps(pkgInfo, depsOptions)
if options.depsOnly:
result.pkg = pkgInfo

View file

@ -273,7 +273,6 @@ proc readPackageInfo(nf: NimbleFile, options: Options,
if onlyMinimalInfo:
result.name = minimalInfo.name
result.version = minimalInfo.version
result.specialVersion = result.version
result.isNimScript = true
result.isMinimal = true
else:
@ -288,6 +287,9 @@ proc readPackageInfo(nf: NimbleFile, options: Options,
" " & getCurrentExceptionMsg() & "."
raise newException(NimbleError, msg)
# By default specialVersion is the same as version.
result.specialVersion = result.version
# The package directory name may include a "special" version
# (example #head). If so, it is given higher priority and therefore
# overwrites the .nimble file's version.

View file

@ -9,6 +9,6 @@ bin = @["issue289"]
# Dependencies
requires "nim >= 0.15.3", "https://github.com/nimble-test/packagea.git 0.6.0"
requires "nim >= 0.15.0", "https://github.com/nimble-test/packagea.git 0.6.0"
requires "https://github.com/nimble-test/packagea.git#head"

View file

@ -7,5 +7,5 @@ license = "MIT"
# Dependencies
requires "nim >= 0.15.3"
requires "nim >= 0.15.0"

View file

@ -7,5 +7,5 @@ license = "MIT"
# Dependencies
requires "nim >= 0.15.3"
requires "nim >= 0.15.0"

View file

@ -9,5 +9,5 @@ bin = @["c"]
# Dependencies
requires "nim >= 0.15.3"
requires "nim >= 0.15.0"

View file

@ -7,5 +7,5 @@ license = "MIT"
# Dependencies
requires "nim >= 0.15.3"
requires "nim >= 0.15.0"

View file

@ -9,5 +9,5 @@ bin = @["y"]
# Dependencies
requires "nim >= 0.15.3"
requires "nim >= 0.15.0"

View file

@ -7,5 +7,5 @@ license = "MIT"
# Dependencies
requires "nim >= 0.15.3"
requires "nim >= 0.15.0"

View file

@ -33,7 +33,6 @@ proc execNimble(args: varargs[string]): tuple[output: string, exitCode: int] =
quotedArgs = quoted_args.map((x: string) => ("\"" & x & "\""))
result = execCmdEx(quotedArgs.join(" "))
echo(result.output)
proc processOutput(output: string): seq[string] =
output.strip.splitLines().filter((x: string) => (x.len > 0))