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 remote branch 'origin/bug_347_adenin_unicable_xml'
[enigma2.git]
/
lib
/
python
/
Components
/
PluginComponent.py
diff --git
a/lib/python/Components/PluginComponent.py
b/lib/python/Components/PluginComponent.py
old mode 100644
(file)
new mode 100755
(executable)
index
fff5c47
..
5e439fd
--- a/
lib/python/Components/PluginComponent.py
+++ b/
lib/python/Components/PluginComponent.py
@@
-46,7
+46,7
@@
class PluginComponent:
for pluginname in os_listdir(directory_category):
path = directory_category + "/" + pluginname
if os_path.isdir(path):
for pluginname in os_listdir(directory_category):
path = directory_category + "/" + pluginname
if os_path.isdir(path):
- if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
+ if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py
o") or fileExists(path + "/plugin.py
"):
try:
plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
try:
plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
@@
-121,7
+121,7
@@
class PluginComponent:
wakeup = -1
for p in self.pluginList:
current = p.getWakeupTime()
wakeup = -1
for p in self.pluginList:
current = p.getWakeupTime()
- if current > -1 and
wakeup < current
:
+ if current > -1 and
(wakeup > current or wakeup == -1)
:
wakeup = current
return int(wakeup)
wakeup = current
return int(wakeup)