aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2007-09-24 00:46:31 +0000
committerFelix Domke <tmbinc@elitedvb.net>2007-09-24 00:46:31 +0000
commit393d8782dc0d19f4c67c1d988ab0631762c714a7 (patch)
tree4943abc450690339913d9ad3072d25b812178503
parent4eac43bf1c66847feef1711990e4c67043f90d79 (diff)
downloadenigma2-393d8782dc0d19f4c67c1d988ab0631762c714a7.tar.gz
enigma2-393d8782dc0d19f4c67c1d988ab0631762c714a7.zip
fix skin error messages
-rw-r--r--skin.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/skin.py b/skin.py
index 3c4b9e1f..b0b45055 100644
--- a/skin.py
+++ b/skin.py
@@ -289,12 +289,14 @@ def lookupScreen(name):
return x, path
return None, None
-def readSkin(screen, skin, name, desktop):
- if not isinstance(name, list):
- name = [name]
+def readSkin(screen, skin, names, desktop):
+ if not isinstance(names, list):
+ names = [names]
+
+ name = "<embedded-in-'%s'>" % screen.__class__.__name__
# try all skins, first existing one have priority
- for n in name:
+ for n in names:
myscreen, path = lookupScreen(n)
if myscreen is not None:
# use this name for debug output
@@ -308,7 +310,7 @@ def readSkin(screen, skin, name, desktop):
if myscreen is None and getattr(screen, "skin", None):
myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
- assert myscreen is not None, "no skin for screen '" + repr(name) + "' found!"
+ assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
screen.skinAttributes = [ ]