aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2013-12-05 13:28:48 +0100
committerRaimo Niskanen <[email protected]>2013-12-05 13:28:48 +0100
commitcdf8fdf8f59f06d18749c71b772bc468d36b6afd (patch)
tree1afa8109d27d995eef8a7b3fc839cf645fd4490e /lib/sasl
parent2918674d8c83ed1e38a8a8bd6b21f916ee5303f9 (diff)
parentd4c92bf58248124199fac354cdf3fe5fbc727a3f (diff)
downloadotp-cdf8fdf8f59f06d18749c71b772bc468d36b6afd.tar.gz
otp-cdf8fdf8f59f06d18749c71b772bc468d36b6afd.tar.bz2
otp-cdf8fdf8f59f06d18749c71b772bc468d36b6afd.zip
Merge branch 'schlagert/fix_emulator_upgrades' into maint
* schlagert/fix_emulator_upgrades: Fix boot file generation for intermediate releases.
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/src/release_handler.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index c1b715b970..a5a234cbc0 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1108,7 +1108,7 @@ new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Maste
Args = [ToVsn,Opts],
{ok,FromBoot} = read_file(FromBootFile,Masters),
{ok,ToBoot} = read_file(ToBootFile,Masters),
- {{_,_,KernelPath},{_,_,SaslPath},{_,_,StdlibPath}} = BaseLibs,
+ {{_,_,KernelPath},{_,_,StdlibPath},{_,_,SaslPath}} = BaseLibs,
Paths = {filename:join(KernelPath,"ebin"),
filename:join(StdlibPath,"ebin"),
filename:join(SaslPath,"ebin")},