commit: 38d3ff6abba53f664e52d0bfafff5ab49d052bb8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 15:36:51 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 15:39:16 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=38d3ff6a
OwnerSet: handle missing or empty exclude-files parameter (bug 796584)
Fixes: f55156d167a6 ("lib/portage/_sets/dbapi.py: add glob support to
exclude-files parameter cnf/sets/portage.conf: add
exclude-files=/usr/src/linux* in module-rebuild set")
Bug: https://bugs.gentoo.org/796584
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/_sets/dbapi.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/portage/_sets/dbapi.py b/lib/portage/_sets/dbapi.py
index 17776f94c..60b26d17c 100644
--- a/lib/portage/_sets/dbapi.py
+++ b/lib/portage/_sets/dbapi.py
@@ -80,13 +80,13 @@ class OwnerSet(PackageSet):
paths = expanded_paths
expanded_exclude_paths = []
- for p in exclude_paths:
+ for p in (exclude_paths or ()):
expanded_exclude_paths.extend(expanded_exc_p[len(eroot)-1:] for expanded_exc_p
in
glob.iglob(os.path.join(eroot,
p.lstrip(os.sep))))
exclude_paths = expanded_exclude_paths
pkg_str = vardb._pkg_str
- if exclude_paths is None:
+ if exclude_paths:
for link, p in vardb._owners.iter_owners(paths):
pkg = pkg_str(link.mycpv, None)
rValue.add("%s:%s" % (pkg.cp, pkg.slot))
