aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-30 11:34:01 +0100
committerSiri Hansen <[email protected]>2011-11-30 11:34:01 +0100
commit8800c07a30b60ef450e2bac6dd920cccda7483ad (patch)
tree6e2f05dd0d75f5e5166690b245cffd99cfa9f01d /lib/sasl/src
parenta5cc25ed213dd640c2f46dcf8a5bbf78bc65f807 (diff)
parent9246167aeea52c7ce956dc5c21c5e4992fe822d5 (diff)
downloadotp-8800c07a30b60ef450e2bac6dd920cccda7483ad.tar.gz
otp-8800c07a30b60ef450e2bac6dd920cccda7483ad.tar.bz2
otp-8800c07a30b60ef450e2bac6dd920cccda7483ad.zip
Merge branch 'siri/sasl/duplicate-rel-file/OTP-9746'
* siri/sasl/duplicate-rel-file/OTP-9746: Keep unpack_release backwards compatible with old systools:make_tar
Diffstat (limited to 'lib/sasl/src')
-rw-r--r--lib/sasl/src/release_handler.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index ce34674e25..522c7b496b 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -842,6 +842,13 @@ do_unpack_release(Root, RelDir, ReleaseName, Releases) ->
extract_tar(Root, Tar),
NewReleases = [Release#release{status = unpacked} | Releases],
write_releases(RelDir, NewReleases, false),
+
+ %% Keeping this for backwards compatibility reasons with older
+ %% systools:make_tar, where there is no copy of the .rel file in
+ %% the releases/<vsn> dir. See OTP-9746.
+ Dir = filename:join([RelDir, Vsn]),
+ copy_file(RelFile, Dir, false),
+
{ok, NewReleases, Vsn}.
%% Note that this function is not executed by a client