kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'haxelib path lib:version' if version is equal to set, and multiple installs have the same version (like 1,0,0 and git and hg)

Browse Source
This commit is contained in:
Joshua Granick
2017-05-22 13:33:28 -07:00
parent 8d4b5151b5
commit 9393cfc681
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/haxelib/client/Main.hx
View File

@@ -1079,9 +1079,13 @@ class Main {
return dev; return dev;
} }
} }
var current = try getCurrent(dir) catch(e:Dynamic) null;
if ( current != null && matchVersion(version, current) ) {
return dir+"/"+Data.safe(current);
}
var matches = []; var matches = [];
for( v in FileSystem.readDirectory(dir) ) { for( v in FileSystem.readDirectory(dir) ) {
if( v == version) return dir + "/" + v; if( v == version ) return dir+"/"+v;
if( v.charAt(0) == "." ) if( v.charAt(0) == "." )
continue; continue;
v = Data.unsafe(v); v = Data.unsafe(v);
@@ -1098,7 +1102,7 @@ class Main {
} }
var best:Dynamic = null; var best:Dynamic = null;
for( match in matches ) { for( match in matches ) {
if (best == null || match.ver > best.ver) { if (best == null || match.ver > best.ver || (match.ver == best.ver && match.dir.indexOf (",") == -1)) {
best = match; best = match;
} }
} }