diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2011-01-28 04:55:52 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2011-01-28 04:55:52 +0100 |
| commit | f32b288b3236e41686e67eda2bccf2f083223bca (patch) | |
| tree | b32dc385a97c594e903fe50854cc3d768f26ed5b /lib/python/Components | |
| parent | aaa6a9751a34e2c0041210eedc3b4fb5915439ce (diff) | |
| parent | 3ca124dd916f82dcfd4f069daf1a3f342956e520 (diff) | |
| download | enigma2-f32b288b3236e41686e67eda2bccf2f083223bca.tar.gz enigma2-f32b288b3236e41686e67eda2bccf2f083223bca.zip | |
Merge branch 'obi/master' into experimental
Diffstat (limited to 'lib/python/Components')
| -rwxr-xr-x | lib/python/Components/DreamInfoHandler.py | 2 | ||||
| -rwxr-xr-x | lib/python/Components/Ipkg.py | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py index 03d52157..8e9c29d1 100755 --- a/lib/python/Components/DreamInfoHandler.py +++ b/lib/python/Components/DreamInfoHandler.py @@ -397,7 +397,7 @@ class DreamInfoHandler: def installIPK(self, directory, name): if self.blocking: - os.system("ipkg install " + directory + name) + os.system("opkg install " + directory + name) self.installNext() else: self.ipkg = IpkgComponent() diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py index 71447775..cc559657 100755 --- a/lib/python/Components/Ipkg.py +++ b/lib/python/Components/Ipkg.py @@ -19,9 +19,8 @@ class IpkgComponent: CMD_UPDATE = 3 CMD_UPGRADE = 4 - def __init__(self, ipkg = '/usr/bin/ipkg'): + def __init__(self, ipkg = 'opkg'): self.ipkg = ipkg - self.opkgAvail = fileExists('/usr/bin/opkg') 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 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: |