Added cfe support to apk

git-svn-id: svn://svn.alpinelinux.org/acf/apk/trunk@1047 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 3 insertions, 8 deletions

diff --git a/apk-controller.lua b/apk-controller.lua
index 669184e..797c444 100644
--- a/apk-controller.lua
+++ b/apk-controller.lua
@@ -5,24 +5,19 @@ module (..., package.seeall)
 default_action = "loaded"
 
 read = function(self)
-	local loaded, available = self.model.get_packages()
-	--local loaded = self.model.get_loaded_packages()
-	--local available = self.model.get_available_packages()
-	return ( { loaded = loaded, available=available, self=self } )
+	return self.model.get_packages()
 end
 
-
 loaded = function(self)
 	-- Get command result out of session data
 	local cmdresult = self.sessiondata.cmdresult
 	self.sessiondata.cmdresult = nil
 	local loaded = self.model.get_loaded_packages()
-	return ( { loaded = loaded, cmdresult = cmdresult } )
+	return cfe({ type="group", value={loaded=loaded, cmdresult=cmdresult} })
 end
 
 available = function(self)
-	local available = self.model.get_available_packages()
-	return ( { available=available } )
+	return cfe({ type="group", value={available=self.model.get_available_packages()} })
 end
 
 delete = function(self)