Revert "Fix FOTA script : Handle pkg_type when privacy db migration"

refers to: https://review.tizen.org/gerrit/#/c/157525/

This reverts commit aa3dee639475532204e2f9435c53c04053368fad.

Change-Id: I381c71c94f8597faf43789e74f39c771591a7924

diff --git a/upgrade/201.security_upgrade.sh b/upgrade/201.security_upgrade.sh
index 452cc36d0e64842e602e889d878c074c3c4c293e..709bcf54838105b343d1c98681650e3013e749cd 100644 (file)
--- a/upgrade/201.security_upgrade.sh
+++ b/upgrade/201.security_upgrade.sh
@@ -36,7 +36,7 @@ PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL=/opt/dbspace/.privacy.db-journal
 
 touch $PRIVILEGE_CHECKER_PRIVACY_DB
 touch $PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL
-sqlite3 $PRIVILEGE_CHECKER_PRIVACY_DB "CREATE TABLE PRIVACY_PACKAGE (PKG_TYPE NUMERIC, PKG_ID TEXT not null, UID NUMERIC not null, PRIVACY_NAME TEXT not null, PRIVILEGE_NAME TEXT not null, IS_CRITICAL NUMERIC not null, API_VERSION TEXT not null, IS_PRIVACY_REQUESTABLE NUMERIC not null, UNIQUE(PKG_ID, UID, PRIVILEGE_NAME));"
+sqlite3 $PRIVILEGE_CHECKER_PRIVACY_DB "CREATE TABLE PRIVACY_PACKAGE (PKG_ID TEXT not null, UID NUMERIC not null, PRIVACY_NAME TEXT not null, PRIVILEGE_NAME TEXT not null, IS_CRITICAL NUMERIC not null, API_VERSION TEXT not null, IS_PRIVACY_REQUESTABLE NUMERIC not null, UNIQUE(PKG_ID, UID, PRIVILEGE_NAME));"
 
 chmod 664 $PRIVILEGE_CHECKER_PRIVACY_DB
 chmod 664 $PRIVILEGE_CHECHER_PRIVACY_DB_JOURNAL

diff --git a/upgrade/711.security_privacy_package_migration.sh b/upgrade/711.security_privacy_package_migration.sh
index 8101049528d44e029a3fdcf544f11f555a994ead..0511a23c8db2e4208b01e2ac1a1987414be1f9ab 100644 (file)
--- a/upgrade/711.security_privacy_package_migration.sh
+++ b/upgrade/711.security_privacy_package_migration.sh
@@ -15,13 +15,8 @@ do
        privacy_name=`sqlite3 $CORE_PRIVILEGE_INFO_DB "select privacy_name from privilege_info where privilege_name='$i'"`
        for j in $pkg_list
        do
-               pkg_type=`sqlite3 $PKGMGR_DB "select package_type from package_info where package='$j'"`
                api_version=`sqlite3 $PKGMGR_DB "select package_api_version from package_info where package='$j'"`
-               if [ "$pkg_type" == "wgt" ]; then
-                       sqlite3 $PRIVACY_DB "insert or ignore into privacy_package values (0, '$j', 376, '$privacy_name', '$i', 0, '$api_version')"
-               else
-                       sqlite3 $PRIVACY_DB "insert or ignore into privacy_package values (1, '$j', 376, '$privacy_name', '$i', 0, '$api_version')"
-               fi
+               sqlite3 $PRIVACY_DB "insert or ignore into privacy_package values ('$j', 376, '$privacy_name', '$i', 0, '$api_version')"
        done
 done