Author: titmuss
Date: Mon Jan 5 04:29:04 2009
New Revision: 3674
URL: http://svn.slimdevices.com?rev=3674&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3673): titmuss | 2009-01-05 12:27:45 +0000
Bug: N/A
Description:
Bug fix for UBI upgrades.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jan 5 04:29:04 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3666
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3669
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3673
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua?rev=3674&root=Jive&r1=3673&r2=3674&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/UpgradeUBI.lua
Mon Jan 5 04:29:04 2009
@@ -1,6 +1,6 @@
-local assert, error, pairs, type, pcall = assert, error, pairs, type, pcall
+local assert, error, pairs, pcall, tonumber, type = assert, error, pairs,
pcall, tonumber, type
local oo = require("loop.base")
local io = require("io")
@@ -118,9 +118,9 @@
end
if string.match(line, "Hardware") then
- self._platform = string.lower(string.match(line,
".+:%s+([^%s]+)"))
+ self._platform = string.lower(string.match(line,
".+:%s+(.+)"))
elseif string.match(line, "Revision") then
- self._revision = tonumber(string.match(line,
".+:%s+([^%s]+)"))
+ self._revision = tonumber(string.match(line,
".+:%s+(.+)"))
end
end
@@ -131,11 +131,11 @@
function verifyPlatformRevision(self)
- for platform, revision in string.gmatch(self._boardVersion,
"(%a+):(%d+)") do
+ for platform, revision in string.gmatch(self._boardVersion,
"(%w+):(%d+)") do
platform = string.lower(platform)
revision = tonumber(revision)
- if string.match(platform, self._platform)
+ if string.find(self._platform, platform)
and revision == self._revision then
return true
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
