diff options
| author | Siri Hansen <[email protected]> | 2012-09-14 11:00:04 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-09-14 11:00:04 +0200 |
| commit | 39e413c4129b3bf226f4168713e3a70bfffeef0d (patch) | |
| tree | a435cb9ee84e37da5f9d253b4d97fd9578ecda35 /lib/kernel/src/application.erl | |
| parent | f2230a865e269c468192fa582b1c44fc60ffd5fc (diff) | |
| parent | e98f047b3d4fc888abdb4a111ec1b6c0bfbfacd3 (diff) | |
| download | otp-39e413c4129b3bf226f4168713e3a70bfffeef0d.tar.gz otp-39e413c4129b3bf226f4168713e3a70bfffeef0d.tar.bz2 otp-39e413c4129b3bf226f4168713e3a70bfffeef0d.zip | |
Merge branch 'siri/dont-allow-modvsn-in-app-file/OTP-10417'
* siri/dont-allow-modvsn-in-app-file/OTP-10417:
Don't allow {Mod,Vsn} in modules list in .app file
Diffstat (limited to 'lib/kernel/src/application.erl')
| -rw-r--r-- | lib/kernel/src/application.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl index c299fb085c..9b7c4aa7b8 100644 --- a/lib/kernel/src/application.erl +++ b/lib/kernel/src/application.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -37,8 +37,7 @@ -type application_opt() :: {'description', Description :: string()} | {'vsn', Vsn :: string()} | {'id', Id :: string()} - | {'modules', [(Module :: module()) | - {Module :: module(), Version :: term()}]} + | {'modules', [Module :: module()]} | {'registered', Names :: [Name :: atom()]} | {'applications', [Application :: atom()]} | {'included_applications', [Application :: atom()]} |