git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont show pip options in extension menu when no pip is available
[enigma2.git]
/
lib
/
python
/
Components
/
Ipkg.py
diff --git
a/lib/python/Components/Ipkg.py
b/lib/python/Components/Ipkg.py
index eac264289ff76dcb0eb1d738551d6fcf833feac6..361b136a8718f175334e51863c3890e2e2b89ec1 100644
(file)
--- a/
lib/python/Components/Ipkg.py
+++ b/
lib/python/Components/Ipkg.py
@@
-22,10
+22,7
@@
class IpkgComponent:
self.ipkg = ipkg
self.cmd = eConsoleAppContainer()
self.ipkg = ipkg
self.cmd = eConsoleAppContainer()
- self.cmd.appClosed.get().append(self.cmdFinished)
- self.cmd.dataAvail.get().append(self.cmdData)
self.cache = None
self.cache = None
-
self.callbackList = []
self.setCurrentCommand()
self.callbackList = []
self.setCurrentCommand()
@@
-34,8
+31,11
@@
class IpkgComponent:
def runCmd(self, cmd):
print "executing", self.ipkg, cmd
def runCmd(self, cmd):
print "executing", self.ipkg, cmd
- self.cmd.execute(self.ipkg + " " + cmd)
-
+ self.cmd.appClosed.get().append(self.cmdFinished)
+ self.cmd.dataAvail.get().append(self.cmdData)
+ if self.cmd.execute(self.ipkg + " " + cmd):
+ self.cmdFinished(-1)
+
def startCmd(self, cmd, args = None):
if cmd == self.CMD_UPDATE:
self.runCmd("update")
def startCmd(self, cmd, args = None):
if cmd == self.CMD_UPDATE:
self.runCmd("update")
@@
-56,7
+56,9
@@
class IpkgComponent:
def cmdFinished(self, retval):
self.callCallbacks(self.EVENT_DONE)
def cmdFinished(self, retval):
self.callCallbacks(self.EVENT_DONE)
-
+ self.cmd.appClosed.get().remove(self.cmdFinished)
+ self.cmd.dataAvail.get().remove(self.cmdData)
+
def cmdData(self, data):
print "data:", data
if self.cache is None:
def cmdData(self, data):
print "data:", data
if self.cache is None: