show error messages when hdd-init fails

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 09864fc9f374d72ef3be0f9499ec60d37e9989ed..133e063fee322c413cd3bbdb86d1394f31a20104 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -127,6 +127,8 @@ class Harddisk:
                res = os.system("mkdir /hdd/movies")
                return (res >> 8)
                
+       errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
+
        def initialize(self):
                if self.unmount() != 0:
                        return -5

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 3e90d4fb0dc6cf6d0cb78f0917e3e04516accfcf..1f936010340e167ffe31dad8c7d64dd366b2f449 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -9,8 +9,8 @@ from enigma import eTimer
 class HarddiskWait(Screen):
        def doInit(self):
                self.timer.stop()
-               self.hdd.initialize()
-               self.close()
+               result = self.hdd.initialize()
+               self.close(result)
 
        def __init__(self, session, hdd):
                Screen.__init__(self, session)
@@ -41,9 +41,13 @@ class HarddiskSetup(Screen):
                        "red": self.hddInitialize
                })
 
-       def hddReady(self):
-               self.close()
-
+       def hddReady(self, result):
+               print "Result: " + str(result)
+               if (result != 0):
+                       self.session.open(MessageBox, _("Unable to initialize harddisk.\nPlease refer to the user-manual.\nError: ") + str(self.hdd.errorList[0 - result]))
+               else:
+                       self.close()
+                       
        def hddInitialize(self):
                print "this will start the initialize now!"
                self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)