X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FTools%2FDirectories.py;h=f0ef0de22a3dfd6acca870adc069d270b29c029d;hb=8a21c8eebc037850431ac627061e46e48e93a0ec;hp=518db49d31501b80d92930ceda42bde23d236be6;hpb=b3c4891fe653d87333ada5cb14c0bf102ac7b27a;p=vuplus_dvbapp

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 518db49..f0ef0de 100755
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -57,7 +57,7 @@ defaultPaths = {
 		SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory
 		
 		SCOPE_DEFAULTDIR: (eEnv.resolve("${datadir}/enigma2/defaults/"), PATH_CREATE),
-		SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE),
+		SCOPE_DEFAULTPARTITION: ("/dev/mtdblock6", PATH_DONTCREATE),
 		SCOPE_DEFAULTPARTITIONMOUNTDIR: (eEnv.resolve("${datadir}/enigma2/dealer"), PATH_CREATE),
 		SCOPE_METADIR: (eEnv.resolve("${datadir}/meta"), PATH_CREATE),
 	}
@@ -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):