X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7b0d371a7bbfb9e8d624eec9ed97e9a835f75ca7..cf34bb57372b60d8e66cf5c21e9f73b8d0bc23b8:/lib/python/Components/Ipkg.py

diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
index eac26428..79389b4d 100644
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -22,10 +22,7 @@ class IpkgComponent:
 		self.ipkg = ipkg
 		
 		self.cmd = eConsoleAppContainer()
-		self.cmd.appClosed.get().append(self.cmdFinished)
-		self.cmd.dataAvail.get().append(self.cmdData)
 		self.cache = None
-		
 		self.callbackList = []
 		self.setCurrentCommand()
 		
@@ -34,8 +31,11 @@ class IpkgComponent:
 		
 	def runCmd(self, cmd):
 		print "executing", self.ipkg, cmd
-		self.cmd.execute(self.ipkg + " " + cmd)
-		
+		self.cmd.appClosed.get().append(self.cmdFinished)
+		self.cmd.dataAvail.get().append(self.cmdData)
+		if self.cmd.execute(self.ipkg + " " + cmd):
+			self.cmdFinished(-1)
+
 	def startCmd(self, cmd, args = None):
 		if cmd == self.CMD_UPDATE:
 			self.runCmd("update")
@@ -56,7 +56,9 @@ class IpkgComponent:
 	
 	def cmdFinished(self, retval):
 		self.callCallbacks(self.EVENT_DONE)
-	
+		self.cmd.appClosed.get().remove(self.cmdFinished)
+		self.cmd.dataAvail.get().remove(self.cmdData)
+
 	def cmdData(self, data):
 		print "data:", data
 		if self.cache is None:
@@ -96,7 +98,10 @@ class IpkgComponent:
 				self.callCallbacks(self.EVENT_ERROR, None)
 			elif data.find('ipkg_download: ERROR:') == 0:
 				self.callCallbacks(self.EVENT_ERROR, None)
-			elif data.find('    Configuration file') == 0:
+			elif data.find('    Configuration file \'') >= 0:
+				# Note: the config file update question doesn't end with a newline, so
+				# if we get multiple config file update questions, the next ones
+				# don't necessarily start at the beginning of a line
 				self.callCallbacks(self.EVENT_MODIFIED, data.split(' \'', 1)[1][:-1])
 
 	def callCallbacks(self, event, param = None):