From 10f735f6159c4c1a5fb09b9d1da00b6a286f454c Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
Date: Wed, 13 Aug 2014 19:09:30 +0200
Subject: [PATCH] generic-desktop-applications.post: remove workarounds for
 appfw databases

Change-Id: I8cf7782b9a7c02b84a8928c4fcb0691b36fed1f2
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
---
 scripts/generic-desktop-applications.post | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/scripts/generic-desktop-applications.post b/scripts/generic-desktop-applications.post
index 684d4ab..f5365a8 100644
--- a/scripts/generic-desktop-applications.post
+++ b/scripts/generic-desktop-applications.post
@@ -9,6 +9,9 @@ pkg_initdb
 echo "Fixing multiuser app_info dbs"
 chsmack -a "_" $TZ_SYS_DB/.app_info.db*
 chmod 764 $TZ_SYS_DB/.app_info.db*
+echo "Fixing multiuser pkgmgr-info dbs"
+chsmack -a "_" $TZ_SYS_DB/.pkgmgr*.db*
+chmod 764 $TZ_SYS_DB/.pkgmgr*.db*
 
 # depends on generic-base functions
 function generic_desktop_applications_fix_userhome() {
@@ -19,18 +22,6 @@ function generic_desktop_applications_fix_userhome() {
 	
 	echo "Fix app_info.db of $user"
 	chown -R $user:users $homedir/.applications/dbspace/
-
-	if [ -f $homedir/.applications/dbspace/.app_info.db ]; then
-		sqlite3 $homedir/.applications/dbspace/.app_info.db <<EOF
-attach database '$TZ_SYS_DB/.app_info.db' as common;
-insert into app_info select * from common.app_info;
-EOF
-	else
-		cp $TZ_SYS_DB/.app_info.db $homedir/.applications/dbspace/.app_info.db
-	fi
-
-	chown -R $user:users $homedir/.applications/dbspace/
-	chsmack -a User $homedir/.applications/dbspace/.app_info.db*
 }
 
 # fix app user
-- 
2.7.4