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

diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
index 25e1979..df700d6 100644 (file)
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -104,4 +104,10 @@ class Ipkg:
                self.callbackList.append(callback)
                
        def getFetchedList(self):
-               return self.fetchedList
\ No newline at end of file
+               return self.fetchedList
+       
+       def stop(self):
+               self.cmd.kill()
+               
+       def isRunning(self):
+               return self.cmd.running()

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index 19ab3ee..dc494e6 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@ -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: