From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 3 Jun 2008 00:42:00 +0000 (+0000)
Subject: allow installing from multiple directories
X-Git-Tag: 2.6.0~1191
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/2c32c8ba80f56f7bc1b3561aea2dd25770c33fbd?ds=sidebyside

allow installing from multiple directories
---

diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 9753e42b..858b99a2 100644
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -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])