From 074968b887d0b994bd78631d89a833315101f240 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Fri, 16 Jan 2009 21:24:16 +0000 Subject: Tested by removing expected packages, files, and directories. Fixed resulting bugs. git-svn-id: svn://svn.alpinelinux.org/acf/apk-tools/trunk@1683 ab2d0c66-481e-0410-8bed-d214d4d58bed --- apk-model.lua | 6 +++--- apk.roles | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apk-model.lua b/apk-model.lua index 9da39b8..dda4bad 100644 --- a/apk-model.lua +++ b/apk-model.lua @@ -22,8 +22,8 @@ get_available_packages = function() end get_packages = function() - local loaded = get_loaded() - local available = get_available() + local loaded = get_loaded_packages() + local available = get_available_packages() return cfe({ type="group", value={loaded=loaded, available=available} }) end @@ -48,7 +48,7 @@ install_package = function(package,sessiondata) end get_config = function() - local config = format.parse_ini_file(fs.read_file(configfile) or "", "") + local config = format.parse_ini_file(fs.read_file(configfile) or "", "") or {} local source = cfe({ value=config.APK_PATH or "", label="APK Source" }) return cfe({ type="group", value={source=source}, label="APK Config" }) end diff --git a/apk.roles b/apk.roles index 64369ef..408915e 100644 --- a/apk.roles +++ b/apk.roles @@ -1,4 +1,4 @@ USER=apk:loaded,apk:available EDITOR=apk:config EXPERT=apk:delete,apk:install -ADMIN=apk:loaded,apk:available,apk:config,apk:delete,apk:install +ADMIN=apk:loaded,apk:available,apk:config,apk:delete,apk:install,apk:read -- cgit v1.2.3