Duplicated path error ignored

[Issue#] N/A
[Feature/Bug] N/A
[Problem] Path related rules are not correctly generated after application
upgrade (adding settings folder)
[Cause] Adding existing path to and application causes error and results in a
rollback during perm_end.
[Solution] INSERT in path_view_insert_trigger changed to INSERT OR IGNORE.

[Verification] Upgrade an application. It should succeed despite of registering
paths that already exist in db

Change-Id: Ia0ddfdcac906e44401e6152f839321be967bcb76

diff --git a/db/rules-db.sql b/db/rules-db.sql
index d6691e2..a7fba4c 100644 (file)
--- a/db/rules-db.sql
+++ b/db/rules-db.sql
@@ -544,7 +544,7 @@ BEGIN
     INSERT OR IGNORE INTO label(name) VALUES (NEW.path_label_name);
 
     -- Add the path
-    INSERT INTO app_path(app_id, path, label_id, access, access_reverse, app_path_type_id)
+    INSERT OR IGNORE INTO app_path(app_id, path, label_id, access, access_reverse, app_path_type_id)
     SELECT  application_view.app_id,
             NEW.path,
             label.label_id,

diff --git a/src/rules-db-internals.c b/src/rules-db-internals.c
index 9d8a555..68b0b5c 100644 (file)
--- a/src/rules-db-internals.c
+++ b/src/rules-db-internals.c
@@ -335,7 +335,7 @@ int check_app_label_internal(sqlite3 *p_db,
        if(ret == SQLITE_ROW) {
                // There is such application label
                ret = PC_ERR_DB_LABEL_TAKEN;
-       } if(ret == SQLITE_DONE) {
+       } else if(ret == SQLITE_DONE) {
                // No such application label
                ret = PC_OPERATION_SUCCESS;
        } else {