Merge pull request #2510 from ethereum/develop

Version 0.4.12

1 files changed, 17 insertions, 6 deletions

diff --git a/libdevcore/CommonIO.cpp b/libdevcore/CommonIO.cpp
index 8dbcb00a..52829455 100644
--- a/libdevcore/CommonIO.cpp
+++ b/libdevcore/CommonIO.cpp
@@ -30,11 +30,11 @@
 #include <termios.h>
 #endif
 #include <boost/filesystem.hpp>
-#include "Exceptions.h"
+#include "Assertions.h"
+
 using namespace std;
 using namespace dev;
 
-
 template <typename _T>
 inline _T contentsGeneric(std::string const& _file)
 {
@@ -78,13 +78,24 @@ void dev::writeFile(std::string const& _file, bytesConstRef _data, bool _writeDe
 		if (!fs::exists(p.parent_path()))
 		{
 			fs::create_directories(p.parent_path());
-			DEV_IGNORE_EXCEPTIONS(fs::permissions(p.parent_path(), fs::owner_all));
+			try
+			{
+				fs::permissions(p.parent_path(), fs::owner_all);
+			}
+			catch (...)
+			{
+			}
 		}
 
 		ofstream s(_file, ios::trunc | ios::binary);
 		s.write(reinterpret_cast<char const*>(_data.data()), _data.size());
-		if (!s)
-			BOOST_THROW_EXCEPTION(FileError() << errinfo_comment("Could not write to file: " + _file));
-		DEV_IGNORE_EXCEPTIONS(fs::permissions(_file, fs::owner_read|fs::owner_write));
+		assertThrow(s, FileError, "Could not write to file: " + _file);
+		try
+		{
+			fs::permissions(_file, fs::owner_read|fs::owner_write);
+		}
+		catch (...)
+		{
+		}
 	}
 }