aboutsummaryrefslogtreecommitdiff
path: root/lib/actions
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-11 12:52:48 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-11 12:52:48 +0100
commitbbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (patch)
treec5945c791698c14723e989449e6b4bfcc275c05d /lib/actions
parent4f7990ff2a55874b9eb65e3c9cd47dacb9f76deb (diff)
parent5e6f814d005a01caa437a532e61f4b338617ff67 (diff)
downloadenigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.tar.gz
enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.zip
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts: lib/dvb/decoder.cpp
Diffstat (limited to 'lib/actions')
-rw-r--r--lib/actions/parseactions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/actions/parseactions.py b/lib/actions/parseactions.py
index 4ab71af7..2462a751 100644
--- a/lib/actions/parseactions.py
+++ b/lib/actions/parseactions.py
@@ -65,7 +65,7 @@ def do_file(f, mode):
except:
pass
- raise "action enum must be simple."
+ raise Exception("action enum must be simple.")
counter = 0
@@ -82,7 +82,7 @@ def do_file(f, mode):
if counter:
if t != ",":
- raise "no comma"
+ raise Exception("no comma")
t = tokens.next()
if firsthit: