update Compat for rename of Pkg to OldPkg

also temporarily disable the Project file while things are in flux
JuliaLang · May 22, 2018 · 0d8aec6 · 0d8aec6
1 parent c5527e9
commit 0d8aec6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Project.toml → __Project.toml b/Project.toml → __Project.toml
diff --git a/src/Compat.jl b/src/Compat.jl
@@ -1452,9 +1452,15 @@ else
 end
 
 @static if VERSION < v"0.7.0-DEV.3656"
-    const Pkg = Base.Pkg
+    const OldPkg = Base.Pkg
 else
-    import Pkg
+    vers = "v$(VERSION.major).$(VERSION.minor)"
+    if isdir(abspath(Base.Sys.BINDIR, "..", "share", "julia", "stdlib", vers, "OldPkg"))
+        import OldPkg
+    else
+        import Pkg
+        const OldPkg = Pkg
+    end
 end
 
 @static if VERSION < v"0.7.0-DEV.3630"

diff --git a/src/deprecated.jl b/src/deprecated.jl
@@ -52,6 +52,8 @@ else
     import Base.LinAlg.BLAS.@blasfunc
 end
 
+Base.@deprecate_binding Pkg OldPkg
+
 if VERSION < v"0.7.0-DEV.2915"
     const textwidth = Compat.Unicode.textwidth
     export textwidth