Merge branch 'master' of git.opendreambox.org:/git/enigma2 into acid-burn/network_changes_next

2 files changed, 13 insertions, 6 deletions

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 8e4d0044..f0ef0de2 100755
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -118,7 +118,11 @@ def resolveFilename(scope, base = "", path_prefix = None):
 
 	if flags == PATH_CREATE:
 		if not pathExists(path):
-			mkdir(path)
+			try:
+				mkdir(path)
+			except OSError:
+				print "resolveFilename: Couldn't create %s" % path
+				return None
 
 	fallbackPath = fallbackPaths.get(scope)
 
@@ -224,12 +228,13 @@ def InitFallbackFiles():
 # returns a list of tuples containing pathname and filename matching the given pattern
 # example-pattern: match all txt-files: ".*\.txt$"
 def crawlDirectory(directory, pattern):
-	expression = compile(pattern)
 	list = []
-	for root, dirs, files in walk(directory):
-		for file in files:
-			if expression.match(file) is not None:
-				list.append((root, file))
+	if directory:
+		expression = compile(pattern)
+		for root, dirs, files in walk(directory):
+			for file in files:
+				if expression.match(file) is not None:
+					list.append((root, file))
 	return list
 
 def copyfile(src, dst):
diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py
index 6868929c..0b8b96ad 100644
--- a/lib/python/Tools/Transponder.py
+++ b/lib/python/Tools/Transponder.py
@@ -1,4 +1,5 @@
 from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial
+from Components.NimManager import nimmanager
 
 def ConvertToHumanReadable(tp, type = None):
 	ret = { }
@@ -27,6 +28,7 @@ def ConvertToHumanReadable(tp, type = None):
 			eDVBFrontendParametersSatellite.Modulation_QPSK : "QPSK",
 			eDVBFrontendParametersSatellite.Modulation_QAM16 : "QAM16",
 			eDVBFrontendParametersSatellite.Modulation_8PSK : "8PSK"}[tp["modulation"]]
+		ret["orbital_position"] = nimmanager.getSatName(int(tp["orbital_position"]))
 		ret["polarization"] = {
 			eDVBFrontendParametersSatellite.Polarisation_Horizontal : _("Horizontal"),
 			eDVBFrontendParametersSatellite.Polarisation_Vertical : _("Vertical"),