Remove package from pkgmgr-parser.db even when sm install fails

Change-Id: I645fc92a632f60a5891759b92a1da51ee5d3300d

diff --git a/src/common/sm_api.cpp b/src/common/sm_api.cpp
index 451675531fa399ab88e135358b6daf7630cd3c28..bc70ea06086fe82bbc6175e7ee167e3f1b916bdb 100644 (file)
--- a/src/common/sm_api.cpp
+++ b/src/common/sm_api.cpp
@@ -38,22 +38,24 @@ void install(const InstallRequest &request, lib_retcode expectedResult)
             << " values ('" << request.getPkgId() << "', 'tpk', '" << request.getAppTizenVersion()
             << "', 'auto', '" << request.getPkgId() << "', '/opt/usr/globallapps/"
             << request.getPkgId() << "', 'installed_internal')\"";
-    int result = system(command.str().c_str());
-    RUNNER_ASSERT_MSG(result == 0, "failed to set package_info: " << result);
+    int pkgmgrResult = system(command.str().c_str());
+    RUNNER_ASSERT_MSG(pkgmgrResult == 0, "failed to set package_info: " << pkgmgrResult);
 
-    result = security_manager_app_install(request.get());
-    RUNNER_ASSERT_MSG((lib_retcode)result == expectedResult,
-                      "installing app returned wrong value."
-                          << " InstallRequest: [ " << request << "];"
-                          << " Result: " << result << ";"
-                          << " Expected result: " << expectedResult);
+    int result = security_manager_app_install(request.get());
 
     command = std::ostringstream();
     command << "/usr/bin/sqlite3 "
             << dbPath << ".pkgmgr_parser.db "
             << " \"delete from package_info where package='" << request.getPkgId() << "'\"";
-    result = system(command.str().c_str());
-    RUNNER_ASSERT_MSG(result == 0, "failed to unset package_info: " << result);
+    pkgmgrResult = system(command.str().c_str());
+
+    RUNNER_ASSERT_MSG((lib_retcode)result == expectedResult,
+                      "installing app returned wrong value."
+                      << " InstallRequest: [ " << request << "];"
+                      << " Result: " << result << ";"
+                      << " Expected result: " << expectedResult);
+
+    RUNNER_ASSERT_MSG(pkgmgrResult == 0, "failed to unset package_info: " << pkgmgrResult);
 }
 
 void update(const InstallRequest &request, lib_retcode expectedResult)