don't allow leaving the software update plugin while ipkg is running

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

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index 1ada35eef67e97d3b762ddad0735ec96d0e2a1cc..dc494e6f1517a1ff08ce7611b7eeb3a4b6e47b25 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@ -252,7 +252,7 @@ class UpdatePlugin(Screen):
                self["slider"] = self.slider
                self.activityslider = Slider(0, 100)
                self["activityslider"] = self.activityslider
-               self.status = Label("Upgrading Dreambox... Please wait")
+               self.status = Label(_("Upgrading Dreambox... Please wait"))
                self["status"] = self.status
                self.package = Label()
                self["package"] = self.package
@@ -269,7 +269,7 @@ class UpdatePlugin(Screen):
                self.ipkg.addCallback(self.ipkgCallback)
                
                self.updating = True
-               self.package.setText("Package list update")
+               self.package.setText(_("Package list update"))
                self.ipkg.cmdUpdate()
                        
                self["actions"] = ActionMap(["WizardActions"], 
@@ -327,10 +327,11 @@ class UpdatePlugin(Screen):
                pass
        
        def exit(self):
-               if self.packages != 0 and self.error == 0:
-                       self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished. Do you want to reboot your Dreambox?"))
-               else:
-                       self.close()
+               if not self.ipkg.isRunning():
+                       if self.packages != 0 and self.error == 0:
+                               self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished. Do you want to reboot your Dreambox?"))
+                       else:
+                               self.close()
                        
        def exitAnswer(self, result):
                if result is not None and result: