X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d8ffc3281925011e894d57a9f51423736ee891a..4c1d3d2f5cf39f72bf85041a6ba6665350ea742e:/lib/python/Components/Ipkg.py

diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
old mode 100644
new mode 100755
index 79389b4d..71447775
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -1,4 +1,5 @@
 from enigma import eConsoleAppContainer
+from Tools.Directories import fileExists
 
 class IpkgComponent:
 	EVENT_INSTALL = 0
@@ -20,7 +21,7 @@ class IpkgComponent:
 	
 	def __init__(self, ipkg = '/usr/bin/ipkg'):
 		self.ipkg = ipkg
-		
+		self.opkgAvail = fileExists('/usr/bin/opkg')
 		self.cmd = eConsoleAppContainer()
 		self.cache = None
 		self.callbackList = []
@@ -31,8 +32,8 @@ class IpkgComponent:
 		
 	def runCmd(self, cmd):
 		print "executing", self.ipkg, cmd
-		self.cmd.appClosed.get().append(self.cmdFinished)
-		self.cmd.dataAvail.get().append(self.cmdData)
+		self.cmd.appClosed.append(self.cmdFinished)
+		self.cmd.dataAvail.append(self.cmdData)
 		if self.cmd.execute(self.ipkg + " " + cmd):
 			self.cmdFinished(-1)
 
@@ -52,12 +53,14 @@ class IpkgComponent:
 				self.runCmd("list")
 		elif cmd == self.CMD_INSTALL:
 			self.runCmd("install " + args['package'])
+		elif cmd == self.CMD_REMOVE:
+			self.runCmd("remove " + args['package'])
 		self.setCurrentCommand(cmd)
 	
 	def cmdFinished(self, retval):
 		self.callCallbacks(self.EVENT_DONE)
-		self.cmd.appClosed.get().remove(self.cmdFinished)
-		self.cmd.dataAvail.get().remove(self.cmdData)
+		self.cmd.appClosed.remove(self.cmdFinished)
+		self.cmd.dataAvail.remove(self.cmdData)
 
 	def cmdData(self, data):
 		print "data:", data
@@ -87,9 +90,14 @@ class IpkgComponent:
 			if data.find('Downloading') == 0:
 				self.callCallbacks(self.EVENT_DOWNLOAD, data.split(' ', 5)[1].strip())
 			elif data.find('Upgrading') == 0:
-				self.callCallbacks(self.EVENT_UPGRADE, data.split('    ', 1)[1].split(' ')[0])
+				if self.opkgAvail:
+					self.callCallbacks(self.EVENT_UPGRADE, data.split(' ', 1)[1].split(' ')[0])
+				else:
+					self.callCallbacks(self.EVENT_UPGRADE, data.split('    ', 1)[1].split(' ')[0])
 			elif data.find('Installing') == 0:
 				self.callCallbacks(self.EVENT_INSTALL, data.split(' ', 1)[1].split(' ')[0])
+			elif data.find('Removing') == 0:
+				self.callCallbacks(self.EVENT_REMOVE, data.split(' ', 1)[1].split(' ')[1])
 			elif data.find('Configuring') == 0:
 				self.callCallbacks(self.EVENT_CONFIGURING, data.split(' ', 1)[1].split(' ')[0])
 			elif data.find('An error occurred') == 0: