diff options
| author | Siri Hansen <[email protected]> | 2012-09-10 16:21:38 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-09-11 09:30:19 +0200 |
| commit | 6f3205aed3acfb0a8426e87bfe52d6a36bceeb08 (patch) | |
| tree | d9aba093424bc0cba5e92be708e7b048de104bff /lib/reltool/src/reltool_server.erl | |
| parent | f60e85b22cb57ceecd0c82426c6c484102cf6bd2 (diff) | |
| download | otp-6f3205aed3acfb0a8426e87bfe52d6a36bceeb08.tar.gz otp-6f3205aed3acfb0a8426e87bfe52d6a36bceeb08.tar.bz2 otp-6f3205aed3acfb0a8426e87bfe52d6a36bceeb08.zip | |
[reltool] Allow incl_cond=derived on module level
According to documentation it should be allowed to set
incl_cond=include|exclude|derived, but if set to derived on module
level, reltool_server would crash. This has been corrected.
Diffstat (limited to 'lib/reltool/src/reltool_server.erl')
| -rw-r--r-- | lib/reltool/src/reltool_server.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl index 3d1d7e54bf..3b5b2ff81c 100644 --- a/lib/reltool/src/reltool_server.erl +++ b/lib/reltool/src/reltool_server.erl @@ -674,6 +674,8 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) -> true; exclude -> false; + derived -> + undefined; undefined -> %% print(M#mod.name, hipe, "mod_cond -> ~p\n", %% [ModCond]), @@ -693,6 +695,8 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) -> true; exclude -> false; + derived -> + undefined; undefined -> Default end @@ -783,9 +787,10 @@ mod_mark_is_included(#state{app_tab=AppTab, mod_tab=ModTab, sys=Sys} = S, M#mod{is_pre_included = true, is_included = true}; exclude -> - M#mod{is_pre_included = true, - is_included = true}; - undefined -> + M#mod{is_pre_included = false, + is_included = false}; + ModInclCond when ModInclCond==undefined; + ModInclCond==derived -> M#mod{is_included = true} end, ets:insert(ModTab, M2), |