change flasher part of NFIFlash to handle new style md5sum lines

[enigma2.git] / lib / python / Plugins / SystemPlugins / FrontprocessorUpgrade / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
index 94c81c05453f14d34fd61900f2cc4a6b3af13603..67501b17f7be90245667f9a98e5f15fe7f0e1e10 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
@@ -5,11 +5,14 @@ from Plugins.Plugin import PluginDescriptor
 
 def getUpgradeVersion():
        import os
-       r = os.popen("fpupgrade --version").read()
+       try:
+               r = os.popen("fpupgrade --version").read()
+       except IOError:
+               return None
        if r[:16] != "FP update tool v":
                return None
        else:
-               return int(r[16:])
+               return int(r[16:17])
 
 class FPUpgrade(Screen):
        skin = """
@@ -49,6 +52,6 @@ def Plugins(**kwargs):
        version = getFPVersion()
        newversion = getUpgradeVersion() or 0
        if version is not None and version < newversion:
-               return PluginDescriptor(name="FP Upgrade", where = PluginDescriptor.WHERE_WIZARD, fnc=FPUpgrade)
+               return PluginDescriptor(name="FP Upgrade", where = PluginDescriptor.WHERE_WIZARD, fnc=(8, FPUpgrade))
        else:
                return [ ]