git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DreamInfoHandler.py: small update for new index.xml's.
[enigma2.git]
/
lib
/
python
/
Components
/
Console.py
diff --git
a/lib/python/Components/Console.py
b/lib/python/Components/Console.py
old mode 100644
(file)
new mode 100755
(executable)
index
136d10d
..
a41317e
--- a/
lib/python/Components/Console.py
+++ b/
lib/python/Components/Console.py
@@
-21,7
+21,9
@@
class Console(object):
self.appContainers[name] = eConsoleAppContainer()
self.appContainers[name].dataAvail.append(boundFunction(self.dataAvailCB,name))
self.appContainers[name].appClosed.append(boundFunction(self.finishedCB,name))
self.appContainers[name] = eConsoleAppContainer()
self.appContainers[name].dataAvail.append(boundFunction(self.dataAvailCB,name))
self.appContainers[name].appClosed.append(boundFunction(self.finishedCB,name))
- retval = self.appContainers[name].execute(cmd)
+ if isinstance(cmd, str): # until .execute supports a better api
+ cmd = [cmd]
+ retval = self.appContainers[name].execute(*cmd)
if retval:
self.finishedCB(name, retval)
if retval:
self.finishedCB(name, retval)
@@
-53,3
+55,12
@@
class Console(object):
if self.callbacks[name]:
self.callbacks[name](data,retval,extra_args)
del self.callbacks[name]
if self.callbacks[name]:
self.callbacks[name](data,retval,extra_args)
del self.callbacks[name]
+
+ def kill(self,name):
+ if name in self.appContainers:
+ print "[Console] killing: ",self.appContainers[name]
+ self.appContainers[name].kill()
+
+ def killAll(self):
+ for name in self.appContainers:
+ self.kill(name)