git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/translations' into experimental
[enigma2.git]
/
lib
/
python
/
Components
/
Ipkg.py
diff --git
a/lib/python/Components/Ipkg.py
b/lib/python/Components/Ipkg.py
index 0ba1165ceb4d9f4dc8f7015c94e631d949227595..7144777549c7eb07f7c911e5648f3c4f44556585 100755
(executable)
--- a/
lib/python/Components/Ipkg.py
+++ b/
lib/python/Components/Ipkg.py
@@
-1,4
+1,5
@@
from enigma import eConsoleAppContainer
from enigma import eConsoleAppContainer
+from Tools.Directories import fileExists
class IpkgComponent:
EVENT_INSTALL = 0
class IpkgComponent:
EVENT_INSTALL = 0
@@
-20,7
+21,7
@@
class IpkgComponent:
def __init__(self, ipkg = '/usr/bin/ipkg'):
self.ipkg = ipkg
def __init__(self, ipkg = '/usr/bin/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 = []
@@
-89,7
+90,10
@@
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:
- self.callCallbacks(self.EVENT_UPGRADE, data.split(' ', 1)[1].split(' ')[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])
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: