fix tag prerequisite logic for .info files without tags

[enigma2.git] / lib / python / Components / DreamInfoHandler.py

diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 9753e42b2efb2f3dad5eb9a0d2209cedcba6ee3e..261e800f5f5574f5a9ea7a05b598ddfabcd53f10 100644 (file)
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -29,7 +29,7 @@ class InfoHandler(xml.sax.ContentHandler):
                raise InfoHandlerParseError, error
     
        def startElement(self, name, attrs):
-               print name, ":", attrs.items()
+               #print name, ":", attrs.items()
                self.elements.append(name)
                if name in ["hardware", "bcastsystem", "satellite", "tag"]:
                        if not attrs.has_key("type"):
@@ -63,11 +63,11 @@ class InfoHandler(xml.sax.ContentHandler):
                                                self.filetype = type
                                                self.fileattrs = attrs
        def endElement(self, name):
-               print "end", name
-               print "self.elements:", self.elements
+               #print "end", name
+               #print "self.elements:", self.elements
                self.elements.pop()
                if name == "file":
-                       print "prerequisites:", self.prerequisites
+                       #print "prerequisites:", self.prerequisites
                        if len(self.prerequisites) == 0 or self.prerequisitesMet(self.prerequisites):
                                if not self.attributes.has_key(self.filetype):
                                        self.attributes[self.filetype] = []
@@ -89,7 +89,7 @@ class InfoHandler(xml.sax.ContentHandler):
                        self.attributes["author"] = str(data)
                if self.elements[-1] == "name":
                        self.attributes["name"] = str(data)
-               print "characters", data
+               #print "characters", data
                
 class DreamInfoHandler:
        STATUS_WORKING = 0
@@ -130,7 +130,13 @@ class DreamInfoHandler:
        # prerequisites = True: give only packages matching the prerequisites
        def fillPackagesList(self, prerequisites = True):
                self.packageslist = []
-               packages = crawlDirectory(self.directory, ".*\.info$")
+               packages = []
+               if not isinstance(self.directory, list):
+                       self.directory = [self.directory]
+               
+               for directory in self.directory:
+                       packages += crawlDirectory(directory, ".*\.info$")
+
                for package in packages:
                        self.readInfo(package[0] + "/", package[0] + "/" + package[1])
                        
@@ -138,7 +144,7 @@ class DreamInfoHandler:
                        for package in self.packageslist[:]:
                                if not self.prerequisiteMet(package[0]["prerequisites"]):
                                        self.packageslist.remove(package)
-               return packages
+               return self.packageslist
                        
        def prerequisiteMet(self, prerequisites):
                # TODO: we need to implement a hardware detection here...
@@ -151,11 +157,13 @@ class DreamInfoHandler:
                        if prerequisites.has_key("tag"):
                                if not self.neededTag in prerequisites["tag"]:
                                        return False
+                       else:
+                               return False
                                
                if prerequisites.has_key("satellite"):
                        for sat in prerequisites["satellite"]:
                                if int(sat) not in nimmanager.getConfiguredSats():
-                                       return False                            
+                                       return False                    
                if prerequisites.has_key("bcastsystem"):
                        for bcastsystem in prerequisites["bcastsystem"]:
                                if nimmanager.hasNimType(bcastsystem):