aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric <[email protected]>2013-02-09 11:06:26 -0800
committerEric B Merritt <[email protected]>2013-04-03 18:39:49 -0700
commit8dde5e2607eb18c9e1ea9a19d5b1f563ace11251 (patch)
tree2808601d2f3313467fb8e4888daef1dc157e49a3 /src
parente8c4493943d0eed22f72074516cbe185c6069f80 (diff)
downloadrelx-8dde5e2607eb18c9e1ea9a19d5b1f563ace11251.tar.gz
relx-8dde5e2607eb18c9e1ea9a19d5b1f563ace11251.tar.bz2
relx-8dde5e2607eb18c9e1ea9a19d5b1f563ace11251.zip
move discovered releases to their own area of the relcool state
Diffstat (limited to 'src')
-rw-r--r--src/rcl_prv_discover.erl16
-rw-r--r--src/rcl_state.erl17
2 files changed, 19 insertions, 14 deletions
diff --git a/src/rcl_prv_discover.erl b/src/rcl_prv_discover.erl
index 2f88354..10fb28b 100644
--- a/src/rcl_prv_discover.erl
+++ b/src/rcl_prv_discover.erl
@@ -48,9 +48,9 @@ do(State0) ->
case rcl_rel_discovery:do(State0, LibDirs, AppMeta) of
{ok, Releases} ->
State1 = rcl_state:available_apps(State0, AppMeta),
- State3 = lists:foldl(fun add_if_not_found/2,
- State1, Releases),
- {ok, State3};
+ {ok, rcl_state:discovered_releases(State1, lists:foldl(fun add/2,
+ ec_dictionary:new(ec_dict),
+ Releases))};
Error ->
Error
end;
@@ -68,16 +68,10 @@ format_error(_) ->
%%% Internal Functions
%%%===================================================================
%% @doc only add the release if its not documented in the system
-add_if_not_found(Rel, State) ->
+add(Rel, Dict) ->
RelName = rcl_release:name(Rel),
RelVsn = rcl_release:vsn(Rel),
- try
- rcl_state:get_release(State, RelName, RelVsn),
- State
- catch
- throw:not_found ->
- rcl_state:add_release(State, Rel)
- end.
+ ec_dictionary:add({RelName, RelVsn}, Rel, Dict).
get_lib_dirs(State) ->
LibDirs0 = rcl_state:lib_dirs(State),
diff --git a/src/rcl_state.erl b/src/rcl_state.erl
index 6fd5655..6568541 100644
--- a/src/rcl_state.erl
+++ b/src/rcl_state.erl
@@ -42,6 +42,8 @@
get_release/3,
update_release/2,
releases/1,
+ discovered_releases/1,
+ discovered_releases/2,
default_release/1,
default_release/3,
available_apps/1,
@@ -72,9 +74,8 @@
default_release :: {rcl_release:name(), rcl_release:vsn()},
sys_config :: file:filename() | undefined,
overrides :: [{AppName::atom(), Directory::file:filename()}],
- releases :: ec_dictionary:dictionary({ReleaseName::atom(),
- ReleaseVsn::string()},
- rcl_release:t()),
+ releases :: releases(),
+ discovered_releases :: releases(),
config_values :: ec_dictionary:dictionary(Key::atom(),
Value::term())}).
@@ -87,6 +88,7 @@
rcl_release:t()).
-type cmd_args() :: proplists:proplist().
-type caller() :: command_line | api.
+
-opaque t() :: record(state_t).
%%============================================================================
@@ -107,6 +109,7 @@ new(PropList, Target)
goals=proplists:get_value(goals, PropList, []),
providers = [],
releases=ec_dictionary:new(ec_dict),
+ discovered_releases=ec_dictionary:new(ec_dict),
config_values=ec_dictionary:new(ec_dict),
overrides = proplists:get_value(overrides, PropList, []),
root_dir = proplists:get_value(root_dir, PropList, Root),
@@ -197,6 +200,14 @@ get_release(#state_t{releases=Releases}, Name, Vsn) ->
releases(#state_t{releases=Releases}) ->
Releases.
+-spec discovered_releases(t()) -> releases().
+discovered_releases(#state_t{discovered_releases=Releases}) ->
+ Releases.
+
+-spec discovered_releases(t(), releases()) -> t().
+discovered_releases(State, Releases) ->
+ State#state_t{discovered_releases=Releases}.
+
-spec default_release(t()) ->
{rcl_release:name() | undefined, rcl_release:vsn() | undefined}.
default_release(#state_t{default_release=Def}) ->