add remove to ipkg component and screen

diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
old mode 100644 (file)
new mode 100755 (executable)
index 31889bc..0ba1165
--- 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'])
                                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.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])
                                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:
                        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 (file)
new mode 100755 (executable)
index eac0347..9687633
--- 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.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]
                        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
                        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"))
                elif event == IpkgComponent.EVENT_CONFIGURING:
                        self.package.setText(param)
                        self.status.setText(_("Configuring"))