Author: michael
Date: Mon Feb 1 06:19:05 2010
New Revision: 8438
URL: http://svn.slimdevices.com/jive?rev=8438&view=rev
Log:
Bug: 15522
Description: return immediately to "Try again" page if error occurs.
Ben - should we have a "restart SB and try again" option in this case? Repeated
trial won't help if we run out of memory.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua?rev=8438&r1=8437&r2=8438&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
Mon Feb 1 06:19:05 2010
@@ -305,14 +305,16 @@
if _action == "store" then
if not _fhsink then
log:error("_fhsink not defined")
- return nil, "Something went wrong...
_fhsink not defined"
+ self.sinkErr = "Something went wrong...
_fhsink not defined"
+ return nil
end
-- write content to fhsink
local t, err = _fhsink(chunk)
if not t then
log:error("FLASH err=", err)
- return nil, err
+ self.sinkErr = "FLASH err=" .. err
+ return nil
end
elseif _action == "checksum" then
@@ -343,7 +345,7 @@
local filename = chunk.filename
if string.match(filename, "^zImage") or
- string.match(filename, "^Image") then
+ string.match(filename, "^Image") then
if not self:verifyPlatformRevision() then
self.sinkErr = "Incompatible firmware"
return nil
@@ -352,7 +354,8 @@
_action = "store"
_fhsink, err = self:updatevol("kernel_upg",
filename, chunk.uncompressed_size)
if not _fhsink then
- return nil, err
+ self.sinkErr = err
+ return nil
end
elseif filename == "root.cramfs" then
@@ -364,7 +367,8 @@
_action = "store"
_fhsink = self:updatevol("cramfs_upg",
filename, chunk.uncompressed_size)
if not _fhsink then
- return nil, err
+ self.sinkErr = err
+ return nil
end
elseif filename == "upgrade.md5" then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
