Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Hey, I think we're resolving transitive dependencies, guys

  • Loading branch information...
commit ccf1a9c7b4686e960a7e232b5cc2dbdd35308c35 1 parent 08ce239
@robsimmons robsimmons authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 smack/src/main.sml
  2. +2 −2 smacklib/src/version-index.sml
View
4 smack/src/main.sml
@@ -58,12 +58,12 @@ struct
else print ( "Selected `" ^ name ^ "`\n")
val proto =
- case VersionIndex.getProtocol name ver of
+ case VersionIndex.getProtocol pkg ver of
SOME p => p
| NONE => raise SmackExn
("Installation method for `" ^ name ^ "` not found")
in
- if SmackLib.download (!Configure.smackHome) (name,ver,proto)
+ if SmackLib.download (!Configure.smackHome) (pkg,ver,proto)
then print ( "Package `" ^ name ^ "` already installed.\n")
else ( print ( "Package `" ^ name ^ "` downloaded.\n")
; resolveDependencies pkg ver)
View
4 smacklib/src/version-index.sml
@@ -86,8 +86,8 @@ struct
fun getProtocol pkg ver =
(SOME (#3 (hd
- (List.filter (fn (n,v,p) => n = pkg andalso v = ver)
- (!versionIndex))))) handle _ => NONE
+ (List.filter (fn (n,v,p) => (n = pkg andalso SemVer.eq (v, ver)))
+ (!versionIndex))))) (* handle _ => NONE *)
fun name pkg NONE = pkg
| name pkg (SOME spec) = pkg ^ " " ^ SemVer.constrToString spec
Please sign in to comment.
Something went wrong with that request. Please try again.