From e5e13df52e8b27f79cc70346db594774f0e544cd Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 27 Feb 2015 17:41:29 +0100 Subject: "packages" might list multiple directories Treat each of the separately when searching for packages in there.. Change-Id: Icb2e2cf2a9cac3d15141aeb8ffad0e38f76cf2e7 Closes-Bug: #1426449 --- pbr/hooks/files.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pbr/hooks/files.py b/pbr/hooks/files.py index a274014..48bf9e3 100644 --- a/pbr/hooks/files.py +++ b/pbr/hooks/files.py @@ -84,9 +84,13 @@ class FilesConfig(base.BaseConfig): return man_sections def hook(self): - package = self.config.get('packages', self.name).strip() - if os.path.isdir(package): - self.config['packages'] = find_package.smart_find_packages(package) + packages = self.config.get('packages', self.name).strip() + expanded = [] + for pkg in packages.split("\n"): + if os.path.isdir(pkg.strip()): + expanded.append(find_package.smart_find_packages(pkg.strip())) + + self.config['packages'] = "\n".join(expanded) self.expand_globs() -- cgit v1.2.1