aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src/release_handler.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-10-10 12:22:52 +0200
committerSiri Hansen <[email protected]>2012-10-10 12:22:52 +0200
commit30bef3483796b2b73f438427640b7231df3787b8 (patch)
tree245f53a6b343b4a702cadc670da311e77e13f625 /lib/sasl/src/release_handler.erl
parent0862c07826b3fd5496a9b3bab2bb0b54a8aa7655 (diff)
parent0bdd08b451c0afc859acdc06678a944e6195a279 (diff)
downloadotp-30bef3483796b2b73f438427640b7231df3787b8.tar.gz
otp-30bef3483796b2b73f438427640b7231df3787b8.tar.bz2
otp-30bef3483796b2b73f438427640b7231df3787b8.zip
Merge branch 'siri/sasl/appup-regexp-fix/OTP-10463'
* siri/sasl/appup-regexp-fix/OTP-10463: Fix release_handler:find_script so it can read regexp in appups
Diffstat (limited to 'lib/sasl/src/release_handler.erl')
-rw-r--r--lib/sasl/src/release_handler.erl8
1 files changed, 4 insertions, 4 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} ->