From: acid-burn <acidburn@opendreambox.org>
Date: Fri, 13 Feb 2009 07:27:58 +0000 (+0100)
Subject: add remove to ipkg component and screen
X-Git-Tag: 2.6.0~433^2~5
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea?ds=sidebyside

add remove to ipkg component and screen
---

diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
old mode 100644
new mode 100755
index 31889bcf..0ba1165c
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -52,6 +52,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):
@@ -90,6 +92,8 @@ class IpkgComponent:
 				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:
diff --git a/lib/python/Screens/Ipkg.py b/lib/python/Screens/Ipkg.py
old mode 100644
new mode 100755
index eac03479..96876336
--- a/lib/python/Screens/Ipkg.py
+++ b/lib/python/Screens/Ipkg.py
@@ -54,7 +54,7 @@ class Ipkg(Screen):
 			self.slider.setValue(len(self.cmdList))
 				
 			self.package.setText("")
-			self.status.setText(_("Done - Installed or upgraded %d packages with %d errors") % (self.packages, self.error))
+			self.status.setText(_("Done - Installed, upgraded or removed %d packages with %d errors") % (self.packages, self.error))
 			return False
 		else:
 			cmd = self.cmdList[self.runningCmd]
@@ -90,6 +90,10 @@ class Ipkg(Screen):
 			self.package.setText(param)
 			self.status.setText(_("Installing"))
 			self.packages += 1
+		elif event == IpkgComponent.EVENT_REMOVE:
+			self.package.setText(param)
+			self.status.setText(_("Removing"))
+			self.packages += 1
 		elif event == IpkgComponent.EVENT_CONFIGURING:
 			self.package.setText(param)
 			self.status.setText(_("Configuring"))