Skip to content

Commit 3dbfb92

Browse files
author
José Valim
committed
Release v1.2.6
1 parent a77b856 commit 3dbfb92

File tree

6 files changed

+26
-14
lines changed

6 files changed

+26
-14
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ask Mix to use Rebar 3 to compile it by passing the `manager: :rebar3` option.
8585
Once configured, Mix will prompt you to install Rebar 3 if it is not yet
8686
available.
8787

88-
## v1.2.6-dev
88+
## v1.2.6 (2016-06-06)
8989

9090
### 1. Enhancements
9191

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.6-dev
1+
1.2.6

lib/mix/lib/mix/compilers/elixir.ex

+6-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,12 @@ defmodule Mix.Compilers.Elixir do
220220
## Manifest handling
221221

222222
defp read_manifest(manifest) do
223-
case :file.consult(manifest) do
224-
{:ok, [@manifest_vsn|t]} -> t
223+
try do
224+
case :file.consult(manifest) do
225+
{:ok, [@manifest_vsn|t]} -> t
226+
_ -> []
227+
end
228+
rescue
225229
_ -> []
226230
end
227231
end

lib/mix/lib/mix/dep/elixir_scm.ex

+11-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ defmodule Mix.Dep.ElixirSCM do
1717
end
1818

1919
def read(manifest_path \\ Mix.Project.manifest_path) do
20-
case :file.consult(manifest(manifest_path)) do
21-
{:ok, [{@manifest_vsn, vsn, scm}]} ->
22-
{:ok, vsn, scm}
23-
{:error, {_, :erl_parse, _}} ->
24-
{:ok, "1.0.0", nil} # Force old version if file exists but old format
25-
_ ->
26-
:error
20+
try do
21+
case :file.consult(manifest(manifest_path)) do
22+
{:ok, [{@manifest_vsn, vsn, scm}]} ->
23+
{:ok, vsn, scm}
24+
{:error, {_, :erl_parse, _}} ->
25+
{:ok, "1.0.0", nil} # Force old version if file exists but old format
26+
_ ->
27+
:error
28+
end
29+
rescue
30+
_ -> :error
2731
end
2832
end
2933
end

lib/mix/lib/mix/tasks/compile.protocols.ex

+6-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,12 @@ defmodule Mix.Tasks.Compile.Protocols do
116116
end
117117

118118
defp read_manifest(manifest) do
119-
case :file.consult(manifest) do
120-
{:ok, [@manifest_vsn|t]} -> t
119+
try do
120+
case :file.consult(manifest) do
121+
{:ok, [@manifest_vsn|t]} -> t
122+
_ -> []
123+
end
124+
rescue
121125
_ -> []
122126
end
123127
end

src/elixir.app.src

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{application, elixir,
22
[{description, "elixir"},
3-
{vsn, "1.2.6-dev"},
3+
{vsn, "1.2.6"},
44
{modules, [
55
elixir
66
]},

0 commit comments

Comments
 (0)