switch to opkg

[enigma2.git] / lib / python / Components / Ipkg.py

diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
index 7144777549c7eb07f7c911e5648f3c4f44556585..cc5596577a4bab196cbe2e85f25957e51226a24d 100755 (executable)
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -19,9 +19,8 @@ class IpkgComponent:
        CMD_UPDATE = 3
        CMD_UPGRADE = 4
        
        CMD_UPDATE = 3
        CMD_UPGRADE = 4
        

-       def __init__(self, ipkg = '/usr/bin/ipkg'):
+       def __init__(self, ipkg = 'opkg'):

                self.ipkg = ipkg
                self.ipkg = ipkg

-               self.opkgAvail = fileExists('/usr/bin/opkg')

                self.cmd = eConsoleAppContainer()
                self.cache = None
                self.callbackList = []
                self.cmd = eConsoleAppContainer()
                self.cache = None
                self.callbackList = []


@@ -90,10 +89,7 @@ class IpkgComponent:
                        if data.find('Downloading') == 0:
                                self.callCallbacks(self.EVENT_DOWNLOAD, data.split(' ', 5)[1].strip())
                        elif data.find('Upgrading') == 0:
                        if data.find('Downloading') == 0:
                                self.callCallbacks(self.EVENT_DOWNLOAD, data.split(' ', 5)[1].strip())
                        elif data.find('Upgrading') == 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])
+                               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:
                        elif data.find('Installing') == 0:
                                self.callCallbacks(self.EVENT_INSTALL, data.split(' ', 1)[1].split(' ')[0])
                        elif data.find('Removing') == 0: