remove debug code

[enigma2.git] / lib / python / Tools / Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 8fb5c09278cb1db31bdb9f81562967c9cc6c8a97..258940b41f8da6b55ee77063d275364ecd6f76ae 100644 (file)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -42,31 +42,34 @@ def resolveFilename(scope, base = ""):
        print "getting scope", scope, "with base", base
        path = defaultPaths[scope]
        print "path:", path
        print "getting scope", scope, "with base", base
        path = defaultPaths[scope]
        print "path:", path

+
+       if path[1] == PATH_CREATE:
+               if (not pathExists(defaultPaths[scope][0])):
+                       os.mkdir(path[0])

        
        if not fileExists(path[0] + base):
                #try:
                if fallbackPaths.has_key(scope):
        
        if not fileExists(path[0] + base):
                #try:
                if fallbackPaths.has_key(scope):

-                       print 1

                        for x in fallbackPaths[scope]:
                        for x in fallbackPaths[scope]:

-                               print x

                                if x[1] == FILE_COPY:
                                        if fileExists(x[0] + base):
                                                os.system("cp " + x[0] + base + " " + path[0] + base)
                                if x[1] == FILE_COPY:
                                        if fileExists(x[0] + base):
                                                os.system("cp " + x[0] + base + " " + path[0] + base)

+                                               break

                                elif x[1] == FILE_MOVE:
                                        if fileExists(x[0] + base):
                                                os.system("mv " + x[0] + base + " " + path[0] + base)
                                elif x[1] == FILE_MOVE:
                                        if fileExists(x[0] + base):
                                                os.system("mv " + x[0] + base + " " + path[0] + base)

+                                               break

                                elif x[1] == PATH_COPY:
                                        if pathExists(x[0]):
                                                if not pathExists(defaultPaths[scope][0]):
                                                        os.mkdir(path[0])
                                                os.system("cp -a " + x[0] + "* " + path[0])
                                elif x[1] == PATH_COPY:
                                        if pathExists(x[0]):
                                                if not pathExists(defaultPaths[scope][0]):
                                                        os.mkdir(path[0])
                                                os.system("cp -a " + x[0] + "* " + path[0])

+                                               break

                                elif x[1] == PATH_MOVE:
                                        if pathExists(x[0]):
                                                os.system("mv " + x[0] + " " + path[0])
                                elif x[1] == PATH_MOVE:
                                        if pathExists(x[0]):
                                                os.system("mv " + x[0] + " " + path[0])

+                                               break

 
 

-               if path[1] == PATH_CREATE:
-                       if (not pathExists(defaultPaths[scope][0])):
-                               os.mkdir(path[0])

        
        # FIXME: we also have to handle DATADIR etc. here.
        return path[0] + base
        
        # FIXME: we also have to handle DATADIR etc. here.
        return path[0] + base