X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1b01c9c3c05fdd42327406161bd5c51e05fbca19..7199d3c37e7e7065bd6943702b5864fa5186b9a8:/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 31889bcf..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 = []
@@ -52,6 +53,8 @@ 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):
@@ -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: