Merge branch 'master' of github.com:JuliaLang/julia

jiahao · Mar 19, 2013 · fe5d201 · fe5d201
2 parents e736ffc + 69edec1
commit fe5d201
Show file tree

Hide file tree

Showing 2 changed files with 961 additions and 915 deletions.
diff --git a/base/pkg.jl b/base/pkg.jl
@@ -321,7 +321,7 @@ function _resolve()
  if have[pkg] != want[pkg]
  oldver = Metadata.version(pkg,have[pkg])
  newver = Metadata.version(pkg,want[pkg])
- up = oldver <= newver ? "Up" : "Down"
+ up = !is(oldver,VersionNumber) || !is(newver,VersionNumber) || oldver <= newver ? "Up" : "Down"
  info("$(up)grading $pkg: v$oldver => v$newver")
  cd(pkg) do
  run(`git checkout -q $(want[pkg])`)