diff options
| author | Björn Gustavsson <[email protected]> | 2016-08-12 12:12:34 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-08-12 12:12:34 +0200 |
| commit | 240846e5dc852eb6af7e2047d1dd757960780244 (patch) | |
| tree | 520a804f9edf22e79470367cc88e816ffc481839 /lib/asn1/src | |
| parent | 451ca8e5ca10892342ee8627de7ea961a8f06df2 (diff) | |
| parent | ce260c34b555e9e2d74fe9491e9e3a20cfcd6c82 (diff) | |
| download | otp-240846e5dc852eb6af7e2047d1dd757960780244.tar.gz otp-240846e5dc852eb6af7e2047d1dd757960780244.tar.bz2 otp-240846e5dc852eb6af7e2047d1dd757960780244.zip | |
Merge branch 'maint'
* maint:
asn1_test_lib: Compile ASN.1 modules in parallel
Support 'make -j' when compiling ASN.1 modules
[ERL-209] Fix ambiguous_catch_try_state inconsistency error
Diffstat (limited to 'lib/asn1/src')
| -rw-r--r-- | lib/asn1/src/asn1_db.erl | 4 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct.erl | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/asn1/src/asn1_db.erl b/lib/asn1/src/asn1_db.erl index 557eca0ffd..869ea310aa 100644 --- a/lib/asn1/src/asn1_db.erl +++ b/lib/asn1/src/asn1_db.erl @@ -106,7 +106,9 @@ loop(#state{parent = Parent, monitor = MRef, table = Table, loop(State); {save, OutFile, Mod} -> [{_,Mtab}] = ets:lookup(Table, Mod), - ok = ets:tab2file(Mtab, OutFile), + TempFile = OutFile ++ ".#temp", + ok = ets:tab2file(Mtab, TempFile), + ok = file:rename(TempFile, OutFile), loop(State); {From, {new, Mod, Erule}} -> [] = ets:lookup(Table, Mod), %Assertion. diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl index dd269f095d..8783b5418d 100644 --- a/lib/asn1/src/asn1ct.erl +++ b/lib/asn1/src/asn1ct.erl @@ -221,9 +221,8 @@ check_pass(#st{code=M,file=File,includes=Includes, {error,St#st{error=Reason}} end. -save_pass(#st{code=M,erule=Erule,dbfile=DbFile}=St) -> +save_pass(#st{code=M,erule=Erule}=St) -> ok = asn1ct_check:storeindb(#state{erule=Erule}, M), - asn1_db:dbsave(DbFile,M#module.name), {ok,St}. parse_listing(#st{code=Code,outfile=OutFile0}=St) -> |