Use current_exception to catch all exceptions

Change-Id: I0a9a165a82367d911706702eaba162d60717c4f2
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/src/pkg_initdb/pkg_initdb.cc b/src/pkg_initdb/pkg_initdb.cc
index 8f50bab..2246d37 100644 (file)
--- a/src/pkg_initdb/pkg_initdb.cc
+++ b/src/pkg_initdb/pkg_initdb.cc
@@ -156,9 +156,10 @@ int main(int argc, char *argv[]) {
       initial = true;
     bpo::notify(opt_map);
     uid = opt_map["uid"].as<int>();
-  } catch (const boost::exception& error) {
-    std::cerr << "Exception occured: " << boost::diagnostic_information(error)
-              << std::endl;
+  } catch (...) {
+    std::cerr << "Exception occurred: "
+              << boost::current_exception_diagnostic_information() << std::endl;
+    return -1;
   }
 
   RemoveOldDatabases(uid);

diff --git a/src/pkg_recovery/pkg_recovery_helper.cc b/src/pkg_recovery/pkg_recovery_helper.cc
index 50875e9..e5a55cb 100644 (file)
--- a/src/pkg_recovery/pkg_recovery_helper.cc
+++ b/src/pkg_recovery/pkg_recovery_helper.cc
@@ -126,8 +126,9 @@ int main() {
           LOG(ERROR) << "Failed to recover installation: " << entry.second;
       }
     }
-  } catch (const bf::filesystem_error& e) {
-    LOG(ERROR) << "Exception occurred: " << e.what();
+  } catch (...) {
+    std::cerr << "Exception occurred: "
+              << boost::current_exception_diagnostic_information() << std::endl;
     return -1;
   }
   return 0;