summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2016-12-16 21:03:47 -0500
committerGitHub <noreply@github.com>2016-12-16 21:03:47 -0500
commit001933f2ab65205a8cde9cd44e5163f9fbb94096 (patch)
tree5aedafa1d0c8da8b65d82b027479d12aef4597d7
parent1f8df5637c34fbf512873807dc3e5961fd8d3ad6 (diff)
parent6466c324493366cc8c01ee27c08a959e272a4c2c (diff)
Merge pull request #1415 from lrascao/feature/rebar_shell_fix
shell: don't crash apps that use release version operators
-rw-r--r--src/rebar_prv_shell.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index 7d1ee07..72efcf1 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -352,11 +352,15 @@ boot_apps(Apps) ->
normalize_load_apps([]) -> [];
normalize_load_apps([{App, _} | T]) -> [App | normalize_load_apps(T)];
normalize_load_apps([{App, _Vsn, load} | T]) -> [App | normalize_load_apps(T)];
+normalize_load_apps([{App, _Vsn, Operator} | T]) when is_atom(Operator) ->
+ [App | normalize_load_apps(T)];
normalize_load_apps([App | T]) when is_atom(App) -> [App | normalize_load_apps(T)].
normalize_boot_apps([]) -> [];
normalize_boot_apps([{_App, load} | T]) -> normalize_boot_apps(T);
normalize_boot_apps([{_App, _Vsn, load} | T]) -> normalize_boot_apps(T);
+normalize_boot_apps([{App, _Vsn, Operator} | T]) when is_atom(Operator) ->
+ [App | normalize_boot_apps(T)];
normalize_boot_apps([{App, _Vsn} | T]) -> [App | normalize_boot_apps(T)];
normalize_boot_apps([App | T]) when is_atom(App) -> [App | normalize_boot_apps(T)].