From b01c2bb9c8420f07ae2748aabda319506d0dd5ad Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Fri, 17 Jul 2009 10:17:13 +0000
Subject: Spelling change to dependent, cleaned up some comments.

---
 apk-loaded-html.lsp |  4 ++--
 apk-model.lua       | 35 +++++++++++++++--------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/apk-loaded-html.lsp b/apk-loaded-html.lsp
index 2aae111..e24ca00 100644
--- a/apk-loaded-html.lsp
+++ b/apk-loaded-html.lsp
@@ -34,7 +34,7 @@
 </TABLE>
 </DL>
 
-<H2><%= html.html_escape(form.value.dependant.label) %></H2>
+<H2><%= html.html_escape(form.value.dependent.label) %></H2>
 <DL>
 <TABLE>
 	<TR style="background:#eee;font-weight:bold;">
@@ -46,7 +46,7 @@
 		<TD style="white-space:nowrap;" class="header">Description</TD>
 	</TR>
 
-<% for i,packagetable in pairs(form.value.dependant.value) do %>
+<% for i,packagetable in pairs(form.value.dependent.value) do %>
 	<TR>
 	<% if session.permissions.apk.install then %>
 		<TD style="padding-right:20px;white-space:nowrap;">
diff --git a/apk-model.lua b/apk-model.lua
index e23ecc2..3898b30 100644
--- a/apk-model.lua
+++ b/apk-model.lua
@@ -80,30 +80,26 @@ local repository = function()
 	return repo
 end
 
--- Find all the packages that depend on this package (using recursion)
--- package is the name of the package
--- tab saves dependants for already processed packages
--- saved marks when package included in output
--- output is the output
-function find_dependants(package)
+-- Find all the packages that this package depends on (using recursion)
+function find_dependents(package)
 	repo = repo or repository()
 	if not repo[package] then
 		return {}
 	end
-	if not repo[package].dependants then
-		repo[package].dependants = {}
+	if not repo[package].dependents then
+		repo[package].dependents = {}
 		local cmd = path .. "apk info -R "..package
 		local f = io.popen(cmd)
 		for line in f:lines() do
 			if not line:find("depends on:") and not line:find("^%s*$") then
-				table.insert(repo[package].dependants, line)
-				for i,dep in ipairs(find_dependants(line, saved, output)) do
-					table.insert(repo[package].dependants, dep)
+				table.insert(repo[package].dependents, line)
+				for i,dep in ipairs(find_dependents(line, saved, output)) do
+					table.insert(repo[package].dependents, dep)
 				end
 			end
 		end
 	end
-	return repo[package].dependants
+	return repo[package].dependents
 end
 
 local function upgrade_available(package)
@@ -111,8 +107,8 @@ local function upgrade_available(package)
 	repo = repo or repository()
 	if repo[package] and repo[package].version > repo[package].installed then
 		retval = true
-	else -- check the dependants
-		for i,dep in ipairs(find_dependants(package)) do
+	else -- check the dependents
+		for i,dep in ipairs(find_dependents(package)) do
 			if repo[dep] and repo[dep].version > repo[dep].installed then
 				retval = true
 				break
@@ -131,7 +127,7 @@ get_loaded_packages = function()
 
 	-- read in the loaded packages
 	local top = cfe({ type="list", value={}, label="Top Level Packages"})
-	local depend = cfe({ type="list", value={}, label="Dependant Packages"})
+	local depend = cfe({ type="list", value={}, label="Dependent Packages"})
 	for name,value in pairs(repo) do
 		if value.installed then
 			local temp = {}
@@ -148,7 +144,7 @@ get_loaded_packages = function()
 	end
 	table.sort(top.value, function(a,b) return (a.name < b.name) end)
 	table.sort(depend.value, function(a,b) return (a.name < b.name) end)
-	return cfe({ type="group", value={toplevel=top, dependant=depend}, label="Loaded Packages" })
+	return cfe({ type="group", value={toplevel=top, dependent=depend}, label="Loaded Packages" })
 end
 
 get_available_packages = function()
@@ -225,17 +221,16 @@ get_package_details = function(package)
 	else
 		details.version.value = repo[package].version
 		if repo[package].installed then
-			--details.installed.value = string.match(cmdresult[1], "%S*")
 			details.installed.value = repo[package].installed
 			details.comment.value = repo[package].comment
 			local cmdresult = format.string_to_table(run_apk_cmd("info -ws "..package), "\n")
 			details.webpage.value = cmdresult[2] or ""
 			details.size.value = cmdresult[5] or ""
-			local dependants = find_dependants(package)
-			table.insert(dependants, 1, package)
+			local dependents = find_dependents(package)
+			table.insert(dependents, 1, package)
 			local revdeps = {}
 			details.upgrade.value = {}
-			for i,val in ipairs(dependants) do
+			for i,val in ipairs(dependents) do
 				if not revdeps[val] then
 					revdeps[val] = true
 					if repo[val].version > repo[val].installed then
-- 
cgit v1.2.3