diff options
| author | Siri Hansen <[email protected]> | 2011-09-06 09:52:04 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-09-06 09:52:04 +0200 |
| commit | 4498eeecc6ec6742c3473d83cc9d66190ba23fc4 (patch) | |
| tree | d931131fbdd2174d0ff4de4ed4fa5870fc96777c /lib/sasl/src/release_handler.erl | |
| parent | 53475d05e282cf04c9d206240961363a7189c6e7 (diff) | |
| parent | ff6c59699ef71acf04105223d617cbd9dc84b89f (diff) | |
| download | otp-4498eeecc6ec6742c3473d83cc9d66190ba23fc4.tar.gz otp-4498eeecc6ec6742c3473d83cc9d66190ba23fc4.tar.bz2 otp-4498eeecc6ec6742c3473d83cc9d66190ba23fc4.zip | |
Merge branch 'siri/sasl/systools-ebin-dir/OTP-9507' into dev
* siri/sasl/systools-ebin-dir/OTP-9507:
Fix bug in systools:make_tar when path given as just 'ebin'
Diffstat (limited to 'lib/sasl/src/release_handler.erl')
| -rw-r--r-- | lib/sasl/src/release_handler.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl index 4f01f5f559..bc08f94dff 100644 --- a/lib/sasl/src/release_handler.erl +++ b/lib/sasl/src/release_handler.erl @@ -174,7 +174,7 @@ check_install_release(Vsn, Opts) -> check_check_install_options([purge|Opts], _) -> check_check_install_options(Opts, true); -check_check_install_options([Illegal|_],Purge) -> +check_check_install_options([Illegal|_],_Purge) -> {error,{illegal_option,Illegal}}; check_check_install_options([],Purge) -> {ok,Purge}. @@ -2001,7 +2001,7 @@ safe_write_file_m(File, Data, Masters) -> %% 'update_paths' option to release_handler:install_release/2 if the %% code path shall be updated then. %% ----------------------------------------------------------------- -get_new_libs([{App,Vsn,LibDir}|CurrentLibs], NewLibs) -> +get_new_libs([{App,Vsn,_LibDir}|CurrentLibs], NewLibs) -> case lists:keyfind(App,1,NewLibs) of {App,NewVsn,_} = LibInfo when NewVsn =/= Vsn -> [LibInfo | get_new_libs(CurrentLibs,NewLibs)]; |