Correction in marking labels as modified.
authorJan Olszak <j.olszak@samsung.com>
Tue, 12 Nov 2013 15:51:57 +0000 (16:51 +0100)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 14 Nov 2013 13:21:43 +0000 (14:21 +0100)
[Issue#]       N/A
[Bug/Feature]  After uninstalling rules with app's paths stayed.
[Cause]        Wrong order of delete - mark as modified.
[Solution]     Changed the order.
[Verification] Build, install, run tests.

Change-Id: I3c61c552f845b1bf9e02e76c7b837eb7e59b7634

src/rules-db.c

index 0dac040..3849b6d 100644 (file)
@@ -245,13 +245,13 @@ int rdb_remove_application(const char *const s_label_name)
        ret = rdb_begin(&p_db, RDB_TRANSACTION_EXCLUSIVE);
        if(ret != PC_OPERATION_SUCCESS) goto finish;
 
-       ret = remove_app_internal(p_db, s_label_name);
-       if(ret != PC_OPERATION_SUCCESS) goto finish;
-
        ret = add_modified_label_internal(p_db, s_label_name);
        if(ret != PC_OPERATION_SUCCESS) goto finish;
 
        ret = add_modified_apps_path_internal(p_db, s_label_name);
+       if(ret != PC_OPERATION_SUCCESS) goto finish;
+
+       ret = remove_app_internal(p_db, s_label_name);
 
 finish:
        return rdb_finish(p_db, ret);
@@ -440,13 +440,13 @@ int rdb_revoke_app_permissions(const char *const s_app_label_name)
        ret = rdb_begin(&p_db, RDB_TRANSACTION_EXCLUSIVE);
        if(ret != PC_OPERATION_SUCCESS) goto finish;
 
-       ret = revoke_app_permissions_internal(p_db, s_app_label_name);
-       if(ret != PC_OPERATION_SUCCESS) goto finish;
-
        ret = add_modified_label_internal(p_db, s_app_label_name);
        if(ret != PC_OPERATION_SUCCESS) goto finish;
 
        ret = add_modified_apps_path_internal(p_db, s_app_label_name);
+       if(ret != PC_OPERATION_SUCCESS) goto finish;
+
+       ret = revoke_app_permissions_internal(p_db, s_app_label_name);
 
 finish:
        return rdb_finish(p_db, ret);