summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/view
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-06-23 10:14:26 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-06-23 10:14:26 +0000
commite88fd858a1c0d3dbac4703224dc63cb498839432 (patch)
tree8acdc60302e4cdf8a1bdc7ac79ca817373cadff5 /modules/admin-full/luasrc/view
parent307f307a8ee6de0773fdaaeb8afdaf5cd11c1f46 (diff)
modules/admin-full: display raw opkg output, the error codes are useless with recent versions
Diffstat (limited to 'modules/admin-full/luasrc/view')
-rw-r--r--modules/admin-full/luasrc/view/admin_system/packages.htm19
1 files changed, 2 insertions, 17 deletions
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 51c50500a8..524eb4d8b4 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -24,11 +24,6 @@ function rowstyle()
return (rowcnt % 2) + 1
end
-function opkg_error(code)
- code = bit.rshift(tonumber(code), 8)
- return translate("OPKG error code %i" % code)
-end
-
local fstat = fs.statvfs(opkg.overlay_root())
local space_total = fstat and fstat.blocks or 0
local space_free = fstat and fstat.bfree or 0
@@ -80,18 +75,8 @@ local filter = { }
<% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %>
<br /><hr /><br />
- <% if update then %>
- <%:Package lists updated%>: <% if update == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(update)%>)</span><% end %><br />
- <% end %>
- <% if upgrade then%>
- <%:Upgrade installed packages%>: <% if upgrade == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
- <% end %>
- <% if install then for k,v in pairs(install) do %>
- <%:Install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
- <% end end %>
- <% if remove then for k,v in pairs(remove) do %>
- <%:Remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
- <% end end %>
+ <% if #stdout > 0 then %><pre><%=pcdata(stdout)%></pre><% end %>
+ <% if #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %>
<% end %>
</fieldset>
<br />