diff options
| author | acid-burn <acidburn@opendreambox.org> | 2009-02-13 08:27:58 +0100 |
|---|---|---|
| committer | acid-burn <acidburn@opendreambox.org> | 2009-02-13 08:27:58 +0100 |
| commit | cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea (patch) | |
| tree | acdcf9994d5c58b48b888d1365e9ac52a936e899 | |
| parent | 2cfd7bf526965a11394275b6d3b28b87c6c76875 (diff) | |
| download | enigma2-cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea.tar.gz enigma2-cd3cd96e2ff4c6e6a9a38393e4d93167d30f74ea.zip | |
add remove to ipkg component and screen
| -rwxr-xr-x[-rw-r--r--] | lib/python/Components/Ipkg.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/python/Screens/Ipkg.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py index 31889bcf..0ba1165c 100644..100755 --- 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 index eac03479..96876336 100644..100755 --- 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")) |