diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/mix/lib/mix/compilers/elixir.ex | 8 | ||||
| -rw-r--r-- | lib/mix/lib/mix/dep/elixir_scm.ex | 18 | ||||
| -rw-r--r-- | lib/mix/lib/mix/tasks/compile.protocols.ex | 8 | ||||
| -rw-r--r-- | src/elixir.app.src | 2 |
6 files changed, 26 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 97f7c49c3..3f0ff4f5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,7 +85,7 @@ ask Mix to use Rebar 3 to compile it by passing the `manager: :rebar3` option. Once configured, Mix will prompt you to install Rebar 3 if it is not yet available. -## v1.2.6-dev +## v1.2.6 (2016-06-06) ### 1. Enhancements @@ -1 +1 @@ -1.2.6-dev
\ No newline at end of file +1.2.6
\ No newline at end of file diff --git a/lib/mix/lib/mix/compilers/elixir.ex b/lib/mix/lib/mix/compilers/elixir.ex index 85e5610fe..f740e7ca3 100644 --- a/lib/mix/lib/mix/compilers/elixir.ex +++ b/lib/mix/lib/mix/compilers/elixir.ex @@ -220,8 +220,12 @@ defmodule Mix.Compilers.Elixir do ## Manifest handling defp read_manifest(manifest) do - case :file.consult(manifest) do - {:ok, [@manifest_vsn|t]} -> t + try do + case :file.consult(manifest) do + {:ok, [@manifest_vsn|t]} -> t + _ -> [] + end + rescue _ -> [] end end diff --git a/lib/mix/lib/mix/dep/elixir_scm.ex b/lib/mix/lib/mix/dep/elixir_scm.ex index 37a8c366e..7316bcd4e 100644 --- a/lib/mix/lib/mix/dep/elixir_scm.ex +++ b/lib/mix/lib/mix/dep/elixir_scm.ex @@ -17,13 +17,17 @@ defmodule Mix.Dep.ElixirSCM do end def read(manifest_path \\ Mix.Project.manifest_path) do - case :file.consult(manifest(manifest_path)) do - {:ok, [{@manifest_vsn, vsn, scm}]} -> - {:ok, vsn, scm} - {:error, {_, :erl_parse, _}} -> - {:ok, "1.0.0", nil} # Force old version if file exists but old format - _ -> - :error + try do + case :file.consult(manifest(manifest_path)) do + {:ok, [{@manifest_vsn, vsn, scm}]} -> + {:ok, vsn, scm} + {:error, {_, :erl_parse, _}} -> + {:ok, "1.0.0", nil} # Force old version if file exists but old format + _ -> + :error + end + rescue + _ -> :error end end end diff --git a/lib/mix/lib/mix/tasks/compile.protocols.ex b/lib/mix/lib/mix/tasks/compile.protocols.ex index 3a020797c..b8b0d4276 100644 --- a/lib/mix/lib/mix/tasks/compile.protocols.ex +++ b/lib/mix/lib/mix/tasks/compile.protocols.ex @@ -116,8 +116,12 @@ defmodule Mix.Tasks.Compile.Protocols do end defp read_manifest(manifest) do - case :file.consult(manifest) do - {:ok, [@manifest_vsn|t]} -> t + try do + case :file.consult(manifest) do + {:ok, [@manifest_vsn|t]} -> t + _ -> [] + end + rescue _ -> [] end end diff --git a/src/elixir.app.src b/src/elixir.app.src index b188f0bd3..e40eb1cc5 100644 --- a/src/elixir.app.src +++ b/src/elixir.app.src @@ -1,6 +1,6 @@ {application, elixir, [{description, "elixir"}, - {vsn, "1.2.6-dev"}, + {vsn, "1.2.6"}, {modules, [ elixir ]}, |