Elektro: Patching Enigma should now work

diff --git a/elektro/CONTROL/PluginComponent.py.patch b/elektro/CONTROL/PluginComponent.py.patch
deleted file mode 100644 (file)
index bb44472..0000000
--- a/elektro/CONTROL/PluginComponent.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /usr/lib/enigma2/python/Components/PluginComponent.py      2009-03-31 19:32:46.000000000 +0200
-+++ /usr/lib/enigma2/python/Components/PluginComponent.py      2009-07-20 20:02:32.000000000 +0200
-@@ -121,7 +121,7 @@
-               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)
- 

diff --git a/elektro/CONTROL/postinst b/elektro/CONTROL/postinst
index 7376e7c..0655e64 100644 (file)
--- a/elektro/CONTROL/postinst
+++ b/elektro/CONTROL/postinst
@@ -7,7 +7,7 @@ if [ `grep 'if current > -1 and wakeup < current:' /usr/lib/enigma2/python/Compo
    ls -ll /usr/lib/enigma2/python/Components/PluginComponent.py*
    
    echo "Patching"
-   patch -p0 < PluginComponent.py.patch
+   patch -p0 < /usr/lib/enigma2/python/Plugins/Extensions/Elektro/PluginComponent.py.patch
    ls /usr/lib/enigma2/python/Components/PluginComponent.py*
 else
    echo "PluginComponent.py already patched"

diff --git a/elektro/src/PluginComponent.py.patch b/elektro/src/PluginComponent.py.patch
new file mode 100644 (file)
index 0000000..bb44472
--- /dev/null
+++ b/elektro/src/PluginComponent.py.patch
@@ -0,0 +1,11 @@
+--- /usr/lib/enigma2/python/Components/PluginComponent.py      2009-03-31 19:32:46.000000000 +0200
++++ /usr/lib/enigma2/python/Components/PluginComponent.py      2009-07-20 20:02:32.000000000 +0200
+@@ -121,7 +121,7 @@
+               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)
+