aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.ne>2008-01-03 23:04:58 +0000
committerFelix Domke <tmbinc@elitedvb.ne>2008-01-03 23:04:58 +0000
commit63e06372292b393c563aeb2ef306a6beb6be64e1 (patch)
tree14ec7607572f9fb4394874c2894628c6d4c645a9
parent5ed26ea10801db24608a6bf54e3a8ac477ddbf7e (diff)
downloadopenembedded-63e06372292b393c563aeb2ef306a6beb6be64e1.tar.gz
tuxbox-tuxtxt-32bpp: properly handle console container failure conditions
-rw-r--r--packages/tuxbox/tuxbox-tuxtxt-32bpp.bb2
-rw-r--r--packages/tuxbox/tuxbox-tuxtxt-32bpp/add_e2_plugin.diff5
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb b/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
index faf9b0f784..9c3e2e6d7f 100644
--- a/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
+++ b/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
@@ -13,7 +13,7 @@ FILES_${PN} = "/usr/bin /usr/share/fonts /usr/lib/enigma2/python/Plugins/Extensi
SRCDATE = "20060112"
PV = "0.0+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
S = "${WORKDIR}/tuxtxt"
diff --git a/packages/tuxbox/tuxbox-tuxtxt-32bpp/add_e2_plugin.diff b/packages/tuxbox/tuxbox-tuxtxt-32bpp/add_e2_plugin.diff
index 87b105ee5f..10318e5f4d 100644
--- a/packages/tuxbox/tuxbox-tuxtxt-32bpp/add_e2_plugin.diff
+++ b/packages/tuxbox/tuxbox-tuxtxt-32bpp/add_e2_plugin.diff
@@ -29,7 +29,7 @@ diff -Naur tuxtxt_32bpp/python/Makefile.am tuxtxt/python/Makefile.am
diff -Naur tuxtxt_32bpp/python/plugin.py tuxtxt/python/plugin.py
--- tuxtxt_32bpp/python/plugin.py 1970-01-01 01:00:00.000000000 +0100
+++ tuxtxt/python/plugin.py 2006-03-10 21:43:45.000000000 +0100
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,49 @@
+from enigma import *
+from Screens.Screen import Screen
+from Plugins.Plugin import PluginDescriptor
@@ -56,7 +56,8 @@ diff -Naur tuxtxt_32bpp/python/plugin.py tuxtxt/python/plugin.py
+ eDBoxLCD.getInstance().lock()
+ eRCInput.getInstance().lock()
+ fbClass.getInstance().lock()
-+ self.container.execute("/usr/bin/tuxtxt "+self.getValue(iServiceInformation.sTXTPID))
++ if self.container.execute("/usr/bin/tuxtxt "+self.getValue(iServiceInformation.sTXTPID)):
++ self.finished(-1)
+
+ def finished(self,retval):
+ fbClass.getInstance().unlock()