Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 64b4bd4900 - Show all commits

10
src/filesystem.cpp
View file

@ -245,12 +245,12 @@ namespace fc {
boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t), ec ); boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t), ec );
if( ec ) if( ec )
{ {
FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${reason}:${value}", FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${code} : ${message}",
("srcfile",f)("dstfile",t)("reason",ec.category().name())("value",ec.value()) ); ("srcfile",f)("dstfile",t)("code",ec.value())("message",ec.message()) );
} }
} catch ( boost::system::system_error& e ) { } catch ( boost::system::system_error& e ) {
FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${reason}", FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${reason}",
("srcfile",f)("dstfile",t)("reason",e.what() ) ); ("srcfile",f)("dstfile",t)("reason",std::string(e.what()) ) );
} catch ( ... ) { } catch ( ... ) {
FC_THROW( "Copy from ${srcfile} to ${dstfile} failed", FC_THROW( "Copy from ${srcfile} to ${dstfile} failed",
("srcfile",f)("dstfile",t)("inner", fc::except_str() ) ); ("srcfile",f)("dstfile",t)("inner", fc::except_str() ) );
@ -264,7 +264,7 @@ namespace fc {
catch ( boost::system::system_error& e ) catch ( boost::system::system_error& e )
{ {
FC_THROW( "Resize file '${f}' to size ${s} failed: ${reason}", FC_THROW( "Resize file '${f}' to size ${s} failed: ${reason}",
("f",f)("s",t)( "reason", e.what() ) ); ("f",f)("s",t)( "reason", std::string(e.what()) ) );
} }
catch ( ... ) catch ( ... )
{ {
@ -310,7 +310,7 @@ namespace fc {
} catch ( fc::exception& e ) { } catch ( fc::exception& e ) {
FC_RETHROW_EXCEPTION( e, error, FC_RETHROW_EXCEPTION( e, error,
"Rename from ${srcfile} to ${dstfile} failed due to ${reason}, trying to copy then remove", "Rename from ${srcfile} to ${dstfile} failed due to ${reason}, trying to copy then remove",
("srcfile",f)("dstfile",t)("reason",er.what()) ); ("srcfile",f)("dstfile",t)("reason",std::string(er.what())) );
} }
} catch ( ... ) { } catch ( ... ) {
FC_THROW( "Rename from ${srcfile} to ${dstfile} failed", FC_THROW( "Rename from ${srcfile} to ${dstfile} failed",