diff options
| author | Siri Hansen <[email protected]> | 2012-10-03 15:21:04 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-10-03 15:21:04 +0200 |
| commit | 0bdd08b451c0afc859acdc06678a944e6195a279 (patch) | |
| tree | 4ea53a2f303b67c5afe291399fdc550496d94ec2 /lib/sasl/src | |
| parent | 54e7cc9086908a0e5642caa6ac3680557acc5a67 (diff) | |
| download | otp-0bdd08b451c0afc859acdc06678a944e6195a279.tar.gz otp-0bdd08b451c0afc859acdc06678a944e6195a279.tar.bz2 otp-0bdd08b451c0afc859acdc06678a944e6195a279.zip | |
Fix release_handler:find_script so it can read regexp in appups
Diffstat (limited to 'lib/sasl/src')
| -rw-r--r-- | lib/sasl/src/release_handler.erl | 8 | ||||
| -rw-r--r-- | lib/sasl/src/systools_relup.erl | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl index 5efd932c92..1ff3eb96eb 100644 --- a/lib/sasl/src/release_handler.erl +++ b/lib/sasl/src/release_handler.erl @@ -494,10 +494,10 @@ find_script(App, Dir, OldVsn, UpOrDown) -> up -> UpFromScripts; down -> DownToScripts end, - case lists:keysearch(OldVsn, 1, Scripts) of - {value, {_OldVsn, Script}} -> - {NewVsn, Script}; - false -> + case systools_relup:appup_search_for_version(OldVsn,Scripts) of + {ok,Script} -> + {NewVsn,Script}; + error -> throw({version_not_in_appup, OldVsn}) end; {error, enoent} -> diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl index 7fb623bb85..7048184426 100644 --- a/lib/sasl/src/systools_relup.erl +++ b/lib/sasl/src/systools_relup.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 @@ -114,7 +114,8 @@ -define(R15_SASL_VSN,"2.2"). -%% For test purposes only - used by kernel, stdlib and sasl tests +%% Used by release_handler:find_script/4. +%% Also used by kernel, stdlib and sasl tests -export([appup_search_for_version/2]). %%----------------------------------------------------------------- |